stricter type checking for css and js while loading files
Merge remote-tracking branch 'origin/master'