Merge branch 'master' into design
Cambio de iconos.
Added initiatives view for congressmen
Added description to gems
add dir assets
Merge branch 'master' of https://github.com/ciudadanointeligente/legislative
Merge branch 'master' of github.com:ciudadanointeligente/votainteligente-legislativo

Conflicts:
	app/controllers/congressmen_controller.rb
Merge branch 'master' of github.com:ciudadanointeligente/votainteligente-legislativo
Merge branch 'master' of https://github.com/ciudadanointeligente/legislative
remove unused code

# 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.
Updates .gitignore
Merge 'master' into 'design'

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

Merge 'design' to 'master' branch
Improved display of congressmen initiatives
Merge branch 'master' of github.com:ciudadanointeligente/votainteligente-legislativo

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

Merge 'master' to 'production' branch