Merge branch 'master' into prepare-deployment

Conflicts:
	app/models/provider.rb
	app/views/layouts/_nav.html.erb
	app/views/municipios/_buttonBar.html.erb