Merge branch '2.0' into shortcodes-tinymce-upgrades
stuff
Merge branch 'shortcodes-tinymce-upgrades' of https://github.com/bigspring/monolith into shortcodes-tinymce-upgrades
fixes #223
fixes to some fails shortcakes
fixed fail thumbnails border
Merge branch 'shortcodes-tinymce-upgrades' into 2.0

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