Added liquid layout syntax capability. Very simple, not intended to use with dynamic content.
fixing implicit @site argument causing errors on inherited controllers
Merge branch 'fix-implicit-site-argument' into master-cctrl