Merge branch 'mikael' into tony
Merge branch 'tony' of https://github.com/miko91/myLearn into tony