fix for Demo page
Merge branch 'master' of github.com:aglazer/colorpicker

Conflicts:
	jquery.colorpicker.js