Added GCM functionality to app and GCM Server Backend Classes
Merge remote-tracking branch 'origin/master' into StevenDev

Conflicts:
	UberTutorAndroid/app/build.gradle
	UberTutorAndroid/app/src/main/AndroidManifest.xml
	UberTutorAndroid/gradle/wrapper/gradle-wrapper.properties