Improve on broken MySQL handling of login tokens #1234
Bump Rails to 2.3.17 #1233
Don't set YAML on serialized fields #1233
Bump json gem to a safe version for CVE-2013-0269, CVE-2013-0333
Remove monkey patch which is already included in Rails 2.3.17 #1233
Adapt tests for escaping of ' introduced in Rails 2.3.16

Conflicts:
	test/integration/application_test.rb
	test/unit/lib/chili_project/liquid_test.rb
	test/unit/mail_handler_test.rb
Update changelog for v2.10.0 release
Bump version to v2.10.0