#176 Removed redundant shortcodes
Merge branch '2.0' into feature/refactor-shortcodes
created standard shortcodes and kitchen sink
Fixed issue where calls to builder weren't working
Merge branch 'feature/refactor-shortcodes' of https://github.com/bigspring/monolith into feature/refactor-shortcodes

Conflicts:
	index.php
Removed test code
Removed duplicate content loop on index
created block grid parts
#176 Implement new version of childpages and pages shortcode that now use layouts
Merge branch 'feature/refactor-shortcodes' of https://github.com/bigspring/monolith into feature/refactor-shortcodes
created fail accordion layout parts
Merge branch 'feature/refactor-shortcodes' into 2.0