template combination as admin
reverted users_controller test
deleted role shoulda stuff