Merge branch 'master' of https://github.com/airblade/paper_trail into merge-with-lyfeyaj

Conflicts:
	lib/paper_trail/has_paper_trail.rb