add bootstrap 3.0.2
Merge branch 'master' of https://github.com/ciudadanointeligente/votainteligente-legislativo
refactor display advanced search
add font-awesome
refactor users display
Merge branch 'bootstrap'

Conflicts:
	app/views/layouts/application.html.erb