Merge branch 'development'
Nicola|User can save route information from MMF
Merge branch 'master' of https://github.com/yoshdog/challenge-me into development
Nicola|fixed merge conflicts