converted user erb files to haml
Merge branch 'develop' of github.com:vparihar01/hippo into develop