finished (...) map fragment
Merge branch 'master' of https://github.com/dvicini/ese2013-team6
fixed action bar, now hides the spinner. Also readded the settings button