Changes to settings to use the onchangelistener.

Change to database adapter1 to remove unused methods.

Created class in settings to return the settings if needed.
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace

Conflicts:
	BeatYourPace/src/com/GC01/BeatYourPace/Database/DatabaseAdapter.java
	BeatYourPace/src/com/GC01/BeatYourPace/Database/DatabaseAdapter1.java
	BeatYourPace/src/com/GC01/BeatYourPace/Database/DatabaseMusicPlayer.java
	BeatYourPace/src/com/GC01/BeatYourPace/Main/MainActivity.java