move from haml 2 slim
Merge branch 'master' into develop