;
Merge branch 'master' of https://github.com/fokin33/repo.git

Conflicts:
	GPSLocalService/AndroidManifest.xml