Fixed issue where ColorPicker breaks if the page is scrolled (doh).
Merge branch 'master' into switch

Conflicts:
	build/bundle.js