merge master versions of lux.js and lux.min.js