adding useless user model for merge
fixed merge
Merge branch 'master' of https://github.com/makeready/dramatic
added logged in box