Add userBundle.
Updating views and logout, login, firewall.
Merge branch 'userbundle'