Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'master' and 'dev'
Fixes the error brought by devise gem update
Merge branches 'master' and 'dev' into dev