Refactoring content blocks for better maintenance and improved usability.
Improve content blocks documentation
Merge branch 'master' into contentBlocks