change erb to haml
Merge branch 'feature-haml' into develop

* feature-haml:
  change erb to haml