modified WhereamiViewController
Merge branch 'master' of https://github.com/ncteisen/area-app