convert-to-devise
Merge branch 'convert-to-devise'