kaareandersen/WheresMyFamily — pull request #11 by TommyIsGod (2014-10-23 08:39:11+00:00)
Title: 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