Merge branch 'custom-keys' of https://github.com/cr0ybot/gcmpush

# Conflicts:
#	documentation/index.md
#	example/app.js
#	manifest
#	src/nl/vanvianen/android/gcm/GCMIntentService.java
#	timodule.xml

example/app.js

@@ -21,10 +21,6 @@ gcm.registerPush({
         localOnly: false,  /* Whether this notification should be bridged to other devices */
         priority: +2,  /* Notification priority, from -2 to +2 */
 		bigText: false,
-        /* You can customize the key name of the title, message, and ticker values if you don't have control over how the notification is sent */
-        titleKey: 'title',
-        messageKey: 'message',
-        tickerKey: 'ticker',
         /* You can also set a static value for title, message, or ticker. If you set a value here, the key will be ignored. */
         // title: '',
         // message: '',