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

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/CalendarActivity.java
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/OverviewActivity.java
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LocationActivity.java
	app/src/main/res/layout/activity_overview.xml
Merge pull request #18 from TommyIsGod/master

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