Merge remote-tracking branch 'origin/rails4'

Conflicts:
	lib/paper_trail/has_paper_trail.rb
	lib/paper_trail/version.rb
	test/dummy/config/initializers/paper_trail.rb
	test/unit/model_test.rb
	test/unit/version_test.rb