Merge branch 'master' of bitbucket.org:newedgemedia/blockmoduleblog

# Conflicts:
#	_config/config.yml
#	code/Extension/BlogExtension.php
