Trying to fix git
Merge branch 'master' of https://github.com/Nirespire/Rogo

Conflicts:
	google_play_services/libproject/google-play-services_lib/bin/google-play-services_lib.jar