CHanges to db and settings
binarys...
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace

Conflicts:
	BeatYourPace/AndroidManifest.xml
	BeatYourPace/bin/AndroidManifest.xml
	BeatYourPace/bin/BeatYourPace.apk
	BeatYourPace/bin/classes.dex
	BeatYourPace/bin/resources.ap_
	BeatYourPace/src/com/GC01/BeatYourPace/ArchiveFiles/DataModel.java
	BeatYourPace/src/com/GC01/BeatYourPace/ArchiveFiles/DatabaseActivity.java