new colors

Conflicts:
	angular-upload/example/index.html