Merge pull request #28 from koalahamlet/mapFragment

move mapfragment into main activity
Ability to edit and flag content in the details screen
Merge branch 'master' into detail_edit_flag
Merge pull request #29 from koalahamlet/detail_edit_flag

Ability to edit and flag content in the details screen
Merge branch 'master' into mapFragment

Conflicts:
	kARTography/bin/classes.dex
	kARTography/bin/classes/kartography/app/MainActivity.class
	kARTography/bin/kARTography.apk