Greening specs...
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample_app/spec/requests/authentication_pages_spec.rb