added mapActivity and a button to this activity
Merge branch 'master' of https://github.com/rickvschalkwijk/killerapp