rspec devise fix
Merge branch 'devise' of https://github.com/ariera/rails-blank-app into devise

Conflicts:
	spec/spec_helper.rb