merge clojure-conf elisp-conf and scheme-conf, js-conf and web-conf
little change
Merge remote-tracking branch 'source/master'