Adding GoogleMap and LocationTracker-Thread
Merge branch 'master' of https://github.com/KosrenDQ/MakeYouFit

Conflicts:
	MakeYouFit/makeYouFit/src/main/AndroidManifest.xml
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/Activities/MainActivity.java
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/Activities/RunningSectionFragment.java
	MakeYouFit/makeYouFit/src/main/res/layout/fragment_running_section.xml
	MakeYouFit/makeYouFit/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/KosrenDQ/MakeYouFit

Conflicts:
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/Activities/MainActivity.java
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/Activities/RunningSectionFragment.java