Merge branch 'master' into UI_changes

Conflicts:
res/layout/activity_main.xml
res/layout/activity_map.xml