devise layouts
Manual merge --
Merge branch 'master' of https://github.com/StrataLabs/nb_app