Merge branch 'master' of https://github.com/SCUPS/SportsBuddy_Android

Conflicts:
	app/src/main/res/layout/fragment_route.xml