colourpicker

EINDELIJK
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/app/scripts/generateformbasedonblocktype.php