Updating Singleton models, MusicPlayer now extends MediaPlayer, Tidying
Code and commenting.
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace
Getting up to date

Conflicts:
	BeatYourPace/gen/com/example/beatyourpace/R.java
	BeatYourPace/src/com/GC01/BeatYourPace/Database/DatabaseAdapter.java
	BeatYourPace/src/com/GC01/BeatYourPace/MusicPlayer/MusicPlayer.java
	BeatYourPace/src/com/GC01/BeatYourPace/MusicPlayer/TrackList.java
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace