First pages commit
Demo updated to master
Merge branch 'master' into gh-pages

Conflicts:
	css/colorpicker.css
removed duplicate files (demo/ vs. rootdir)
fixed demo page
fix botched merge: we threw away the wrong colorpicker.js file!