20:37 in master
20:38 in branch
20:40 in branch
20:44 in master
20:54 in master
20:55 in branch
20:40 in branch
20:55 in branch
21:09 in branch
21:13 in branch
Merge remote-tracking branch 'origin/developer' into developer

Conflicts:
	app/src/main/java/com/example/runtracker/LocationReceiver.java
21:16 in branch
21:20 in dev
21:23 master