kai backup
Merge branch 'master' of github.com:xkeecs/photoLocator

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of github.com:xkeecs/photoLocator
last