clean up
Added prefix ROLE_ to the role names of the roles to be removed from user creation in admin page
Changed @Autowired to @Inject
mergin
fixed conflicts