#135 - More election changes
Fixing merge
Merge branch 'master' of https://github.com/DataViva/dataviva-site

Conflicts:
	dataviva/apps/views.py