Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedIn.java
	app/src/main/res/values/strings.xml