Forgot one line to load jscolor.js
Merge branch 'master' into dev