Added additional test code
Merge branch 'development' of https://github.com/DerekKeeler/content-block into development

Conflicts:
	Content Block/content_block.js