Merge branch 'gcm' of https://github.com/pubnub/java into gcm

Conflicts:
	android/examples/PubnubExample/src/com/pubnub/examples/pubnubExample10/MainActivity.java
	java/examples/src/com/pubnub/examples/PubnubPushSampleCode.java
Merge remote-tracking branch 'origin/consolefixes' into develop