#54: Allow user to change color of preset
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/zo2/assets/css/admin.css