Fix typo in mongoid.yml configuration template
Merge pull request #3836 from Zorbash/patch-1

Fix typo in mongoid.yml configuration template
Allow cache timestamp format to be changed like in ActiveRecord.
Revert "Remove inverse_of_field related metadata"

This reverts commit aedc41a46886efc576339fe452692ea093b550be.
Revert "Only set the inverse field value when needed."

This reverts commit ee26cea26da1d073a8c76abc73d24143789a4bae.

Conflicts:
	CHANGELOG.md
	spec/mongoid/relations/referenced/in_spec.rb
	spec/mongoid/relations/referenced/many_spec.rb
Revert "Remove parent_field field from polymorphic relations."

This reverts commit 65b2571f1abaa659ed76baf26afbf58b5fcad8bb.

Conflicts:
	CHANGELOG.md
	spec/mongoid/relations/referenced/in_spec.rb
Revert "Fix extra query on has_one associations"

This reverts commit 5a1f8f3b5256af3cfb3d3fc99737c37a3660591e.