Update devise
Fix capistrano settings
Merge branch 'master' into release