adds devise, but doesn't use it yet
Merge branch 'master' into HEAD