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
Nicola | first mmf logging test passing
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development

Conflicts:
	app/controllers/identities_controller.rb