back button works now
Merge branch 'master' of https://github.com/Akodiat/Ljudjagare

Conflicts:
	RunForLife/src/se/chalmers/group42/controller/MainActivity.java
	RunForLife/src/se/chalmers/group42/controller/MainRunFragment.java
wadwadwa