Merge branch 'master' of https://github.com/GerbenLimburg/docpad-plugin-quickit
Added metadata of page to blockcontext

Conflicts:
	assets/app/content/content.js
	assets/common/blockRegistry/blockRegistry.js
	src/api/content.js