merge master into node-js-refactor
refactor configuration
enable js concatenation and minification, add basic environment switching