Merge branch '2.0' into feature-tinymce-shorcodes
changed intro shortcake
merged 2.0 into shortcodes
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
Merge branch 'feature-tinymce-shorcodes' into 2.0

Conflicts:
	Gruntfile.js
	assets/js/base.js
	assets/js/ie.js
	footer.php
	layouts/organisms/nav-topbar.php