Merge branch 'master' into develop
stuff
updating devise error message
Merge branch 'develop'