merge
Merge branch 'master' of https://github.com/j-a-c/mdevproject

Conflicts:
	bin/AndroidManifest.xml
adding map fragment activity - called after login as test