+
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/google-play-services_lib/libs/google-play-services.jar