Adding multiple UI and function updates
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace
resolving conflicts
Conflicts:
	BeatYourPace/gen/com/example/beatyourpace/R.java
	BeatYourPace/res/values/strings.xml
	BeatYourPace/src/com/GC01/BeatYourPace/ArchiveFiles/activity_data.xml
	BeatYourPace/src/com/GC01/BeatYourPace/ArchiveFiles/activity_database.xml
	BeatYourPace/src/com/GC01/BeatYourPace/ArchiveFiles/settings.xml