Conflicts:
	test/integration/application_test.rb
	test/unit/lib/chili_project/liquid_test.rb
	test/unit/mail_handler_test.rb