Started haml helpers
Fixed conflict
Merge branch 'master' into dev
Merged master to dev
Added a password_field helper