Fixed issue with jscolor script for production environment
Merge branch 'master' into deploy