Fix failing AdminController test
Merge branch 'master' of github.com:TeaWithStrangers/tws-on-rails