added spec test for mapmyrun sync
Merge branch 'master' of https://github.com/yoshdog/challenge-me into development
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development
Chloe | Made the search results link to events
Nicola | first mmf logging test passing
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development

Conflicts:
	app/controllers/identities_controller.rb
 Chloe | Search bar on homepage right aligned
new pledge button styling
Merge branch 'development' of github.com:yoshdog/challenge-me into development
 Chloe | Tested the search functionality
Testing new landing page format - let's go setup etc
Jamie | Map My Run button styling
Fixed pending test
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development
Nicola|added mapmyfitness stuff
fixed merge conflicts
Nicola |updated training session modal
Nicola|fixed mmf connection errors
Jamie | Training modal and pledge box styling
Merge branch 'development' of github.com:yoshdog/challenge-me into development