minor changes
Merge branch 'master' of https://github.com/D-A-S-L/Care-Bird

Conflicts:

	CareBirdApp/app/src/main/java/com/dasl/android/carebird/app/locationLog.java