google play services
Merge branch 'master' of https://github.com/andersonbr/roboguice.git

Conflicts:
	.gitignore