added Manager scenarios, fixed some routing errors in step defintions
Merge branch 'admin'
merged conflict, dry-ed out user_controller