Added more missing locales
Merge remote-tracking branch 'upstream/develop' into upmerge

Conflicts:
	config/locales/en.yml
	config/locales/es.yml