Updated Android SDK
Merge branch 'master' of https://github.com/PushAppsService/PushAppsSDK

Conflicts:
	Android/GCMIntentService.java