Fix somelayout builder, add css & js minify class
Merge remote-tracking branch 'origin/master'