admin controller tests
Merge branch 'rspec'

Conflicts:
	Gemfile
	Gemfile.lock
	spec/spec_helper.rb
Gemfile.lock changed too...
Upgrade assertion from should to expect