Cosmetics
Fix excluding js folder on site build
Merge remote-tracking branch 'origin/master'