Merge branch 'public-one‐color'

Conflicts:
	ucc.js