rename colors
CLOSED - task 115: Error in accepting registration info with unicode
chars 
https://github.com/DigitalCampus/django-oppia/issues/issue/115
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	res/values/colors_oppia.xml
	src/org/digitalcampus/oppia/task/RegisterTask.java