Merge branch 'master' of https://github.com/congresointeractivo/legislative into production

Conflicts:
	config/locales/es.yml
Merge branch 'production' of https://github.com/congresointeractivo/legislative into production
Merge branch 'development' into production
Merge branch 'production' of https://github.com/congresointeractivo/legislative into production
Cambios en produccion para envío de mails de feedback y que google no indexe .xls
Adding public cache to ignore
Merge branch 'production' into development
Merge branch 'production' into development