html2haml on devise erb files
Merge branch 'develop'