Nicola|added mapmyfitness stuff
fixed merge conflicts