Merge branch 'master_colivre' into stable

Conflicts:
	test/unit/article_test.rb
	test/unit/person_test.rb