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

We programmers have a nice new years tradition: We revisit all of
our projects and add 1 to a small number near a "(c)".

-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633