Changed "[error]" to "[mistake]"; Temporary disable Uglify-js due to type error
Merge remote-tracking branch 'origin/master' into gh-pages