Update colors (CEVODEV-14)
Merge branch 'master' into own

Conflicts:
	gitprompt.sh
Remove unused code