Merge branch 'develop'
Renamed project to Medla