Add devise
Merge branch 'develop'