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