haml layout
Merge branch 'hotfix/haml_layout' into develop

* hotfix/haml_layout:
  haml layout