Trying to solve conflicts.
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace.git

Conflicts:
	BeatYourPace/bin/BeatYourPace.apk
	BeatYourPace/bin/classes.dex
	BeatYourPace/bin/resources.ap_
Added Activity classes for Training Mode and Settings, added related
activites into the manifest. Changed the code within the MainActivity to
run the start screen, from this you can navigate to the Training Mode
(with music playback functions) and settings.