move mapfragment into main activity
Merge pull request #28 from koalahamlet/mapFragment

move mapfragment into main activity
Merge branch 'master' into detail_edit_flag