Fixed livereload
Merge remote-tracking branch 'upstream/master'
Fixed livereload
Merge remote-tracking branch 'upstream/master'