Merge remote-tracking branch 'origin/master'
.html not to include js, .scss also get css