Converting categories erb views to haml
Converting categories erb views to haml
Removed scaffolding leftovers
Merge branch 'master' into revision_of_user_management