converted to haml
Merge branch 'development'