Added cancel and ok events upon close
Added cancel and ok events upon close
Merge branch 'master' of git://github.com/vanderlee/colorpicker

Conflicts:
	jquery.colorpicker.js