Rails 4.0.2 and PaperTrail 3.0.0 migration
Merge branch 'master' of github.com:cirope/libreunir

Conflicts:
	Gemfile.lock