new colors
Merge branch 'stable' into changeUIColor

Conflicts:
	CSS/WAVED.css
Merge pull request #282 from KSHSK/changeUIColor

new colors