kaareandersen/WheresMyFamily — pull request #18 by TommyIsGod (2014-11-18 09:13:44+00:00)
Title: 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