Merge branch 'develop'
Merge branch 'develop'
New layout
Css for devise views
Merge branch 'develop'
Fixed conflict
Resoled conflicts