Merge branch 'master' into code-build
JavaScript browserified and uglyfied