Improve build instructions to explain double rebuilds.
Improve content blocks documentation
Merge branch 'master' into contentBlocks