add background color
add colorpicker.js
fix merge
Merge branch 'develop' of github.com:dragondjf/CloudSetuper into develop