Merge branch 'develop' into serving-layouts-using-script-ext
Moved layouts into custom script tags
Merge branch 'serving-layouts-using-script-ext' into develop