re added layouts and activities
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace