fixed bug that made the app crash and added some logic for handling the map if gps or wifi is turned off
dialogs and stuff work
comments and small fixes
merge dev
Merge branch 'userLocation' into dev