dfsdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/AndroidManifest.xml
	bin/R.txt
	gen/.gitignore
	google-play-services_lib/gen/com/google/android/gms/BuildConfig.java