haml layout
Merge branch 'hotfix/haml_layout'

* hotfix/haml_layout:
  haml layout