Spanish tranlations added in text and images
Merge remote-tracking branch 'origin/2014'

Conflicts:
	config/locales/es.yml