Merge pull request #30 from TommyIsGod/master

Location restructure
Merge pull request #31 from TommyIsGod/master

Location restructure
UI improvements
Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/BroadCastReceiver/AlarmReceiver.java
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/Controller/PushNotificationController.java
	app/src/main/res/layout/activity_logged_in_parent.xml
	app/src/main/res/values/strings.xml