updated main.js and minified css file
Merge remote-tracking branch 'origin' into gh-pages