UIButton and colors
Merge branch 'master' of github.com:emi420/Mootor

Conflicts:
	dist/css/color.css
Readding color.css