fixed up the show, and edit for users, now approval of users is functional. Also edited users controller so it is not accessible by a user role
fixed conflicts