Added scalable UI and starting to tidy up code
resolving saturday conflicts, current pace and activities changes reverted.

Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace

Conflicts:
	BeatYourPace/src/com/GC01/BeatYourPace/Main/TrainingModeActivity.java