i
Merge remote-tracking branch 'origin/master'

Conflicts:
	poll.php
	poll/.htaccess
	poll/poll.php
	views/templates/poll-vote.php
FINALLY