Color property
Merge branch 'master' of https://github.com/nmcalabroso/BuildEx

Conflicts:
	application/views/builder/workspace.php
	css/custom.css
Merge branch 'master' of https://github.com/nmcalabroso/BuildEx