Reference minified script.js in base template; fixed jshint issues on compile
Merge remote-tracking branch 'origin/master'