Trying to resolve local conflicts.
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace.git
Added following to enable Google app tracking:

analytics.xml -> under res/values
libGoogleAnalyticsServices.jar -> under /lib