c
Merge branch 'master' of https://github.com/alexmahu/voting-revolution

Conflicts:
	public/system/controllers/viewPoll.js
	server/routes/polls.js
Merge branch 'master' of https://github.com/alexmahu/voting-revolution

Conflicts:
	server/controllers/polls.js