resolved devise layouts
Merge branch 'develop'