Modifications for CongresoInteractivo.org
Adding the country name to the footer
Added beta notice. Improved config.
Merge branch 'production' of https://github.com/congresointeractivo/legislative

Conflicts:
	app/views/mains/_social_network_box.html.haml
	app/views/mains/index.html.haml
	config/legislative.yml
	config/locales/es.yml
Further customizations
New template for homepage intro
Merge branch 'production' of https://github.com/congresointeractivo/legislative
Making bill amount visible always
Merge branch 'master' of https://github.com/ciudadanointeligente/legislative

Conflicts:
	config/locales/es.yml
Adding language files
Fixing language file es-AR
Merge branch 'master' into production
Removed violet background  from contact form
Removed all inherit colors and replaced by CI colors
Correccion de texto: "legisladores"
aproach to display votes
replace hardcode data
- Removed priority filter and glossary
- Lots of language changes
Merge branch 'master' into development

Conflicts:
	app/views/bills/searches.html.haml
	app/views/communications/index.html.haml
Merge pull request #232 from ciudadanointeligente/email_suscription

replace hardcode data