add bare to coffee compiling
Merge branch 'master' into gh-pages
update js