add type to users tables to store user type
add manager model as child of user and generating active_admin manager
removed conflicts after merging new_user_types into master