...
Merge branch 'master' of https://github.com/iomekam/GTSafe

Conflicts:
	google-play-services_lib/bin/google-play-services_lib.jar
Merge branch 'master' of https://github.com/iomekam/GTSafe