Merge pull request #656 from FrozenNode/dev

Merge 4.12.0 into master
Merge pull request #664 from FrozenNode/dev

Merge 4.12.1 into master
added description option documentation to edit_fields and filters & updated examples
added the style of the new description paragraph
added description paragraph if the option is set in the edit_fields model config
added description paragraph if the option is set in the filters model config