Merge branch 'design'
Merge branch 'master' into design
Campana en urgencias y antialiased en body.
Added fields with no style
Merge branch 'design'
Merge branch 'master' into bill_view

Conflicts:
	app/views/layouts/application.html.erb
Arreglo problemas de merge.
Merge master con bill_view
remove chosen css and class chosen
Cambio de imagen a icono en errores 404 y 500
revert changes
Merge branch 'design' of https://github.com/ciudadanointeligente/legislative into design
create database file example
Moved agendas display in home to a partial
Hotfix, added config for cuttlefish in production env
Added user feedback widget
Merge pull request #175 from ciudadanointeligente/user_feedback

Added user feedback widget
Hotfix, un-hardcoded host url in confirmation e-mail template
Merge branch 'master' of github.com:ciudadanointeligente/votainteligente-legislativo
add mysql support