devise merge
heroku devise trial #1
merged changes

Merge https://github.com/jassicacanidy/CallistoReinvented