add colorPicker
add colorPicker
Merge branch 'master' of github.com:linyue/life.js
add colorPicker