take photo
Merge branch 'master' of https://github.com/xkeecs/photoLocator

Conflicts:
	AndroidManifest.xml
	res/layout/include_dialog_nearby_filter.xml