Revert "test"

Conflicts:
	framework/less/libs/color.less
	style.css