update the res files
update--  deal with the conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/styles.xml