added layout and theme to the user model
Merge branch 'dev' of github.com:mod2/codex into dev