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
Elimina info del p. de ley que no queremos que se despliegue.
Despliegue info p. de ley.
Merge branch 'master' into 'bill_view'
add social network button to mainpage
Merge branch 'master' into design
fix display mobile

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Color botón visitado.
Estilo autores y tag de proyecto.