updated Spanish translation
updated Chinese translation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app-messages/messages_es.properties
	app-messages/messages_zh.properties
	bundle-messages/bundle_es.properties
	bundle-messages/bundle_zh.properties