Existing test suite.
Merge branch 'master' into integrated

Conflicts:
	Gemfile
	spec/features/registration_spec.rb
	spec/models/person_spec.rb
	spec/spec_helper.rb