Add role, remove is_admin
Adjust seeds to reflect STI changes
Solved merge conflict with user_controller_spec