Conflicts:
	helios/locale/el/LC_MESSAGES/django.po
	helios/models.py
	helios/templates/_election_admin_actions.html
	helios/templates/election_poll_questions.html
	helios/templates/election_poll_voters_list.html
	heliosauth/locale/el/LC_MESSAGES/django.po
	server_ui/locale/el/LC_MESSAGES/django.po
	zeus/core.py
	zeus/locale/el/LC_MESSAGES/django.po
	zeus/model_tasks.py
	zeus/reports.py
	zeus/results_report.py
	zeus/static/booth/js/jscrypto/helios.js
	zeus/static/booth/locale/el/LC_MESSAGES/djangojs.po
	zeus/static/booth/locale/en/LC_MESSAGES/djangojs.po
	zeus/static/zeus/javascripts/election_stats.js
	zeus/static/zeus/stylesheets/app.css
	zeus/tasks.py
	zeus/urls/election.py
	zeus/views/poll.py
	zeus/views/site.py