manifest fix, warning message
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/appcompat/project.properties
	plugins/google-play-services_lib/project.properties