Register scope in spring xml
Removed unused dependencies and bean
Merge remote-tracking branch 'origin/multiuser' into development