Code validation
Build script mods: no html minification
Merge with master