Merge branch 'feature-tinymce-shorcodes'

Conflicts:
	inc/hooks.php
Merge branch 'feature-tinymce-shorcodes' of https://github.com/bigspring/monolith into feature-tinymce-shorcodes

Conflicts:
	inc/hooks.php