Align to develop, Misc fix in build and JS/CSS loading.