* Fixed Z-index of colorpicker
Merge remote-tracking branch 'origin/master'