Added a history activity and have the location working again
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/technotracks/ch/skitrack_scrum/BaseActivity.java