Merge pull request #17 from TommyIsGod/master

Updated map
Merge pull request #18 from TommyIsGod/master

Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily
Overveiw fixed
Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LocationActivity.java
	app/src/main/res/layout/activity_overview.xml