colors refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values-ru/strings.xml