more devise
Merge branch 'develop' into feature/db