merge
Merge remote-tracking branch 'origin/master'

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