sorted gcm stuff into classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/team/mars/marssenger/main/MainActivity.java