Fixed the problems with the User Login and added custom roles
fixed merge conflict
Fixed the login views and modfied the data so it fits
fixed merge conflicts