Merge branch 'master' into vi-ar

Conflicts:
	elections/templates/base.html
Merge branch 'vi-ar' of github.com:ciudadanointeligente/votainteligente-portal-electoral into vi-ar

Conflicts:
	elections/templates/base.html