Adding forms to simplecov
Adding validators to simplecov
Merge branch 'master' into form_object_refactoring

Conflicts:
	spec/spec_helper.rb