Merge branch 'master' into design
Cambio de iconos.
Merge 'master' into 'design'

Conflicts:
	app/views/congressmen/show.html.haml
Merge pull request #170 from ciudadanointeligente/design

Merge 'design' to 'master' branch