Merge origin/master

Conflicts:
	db/polls.php
Merge origin/master

Conflicts:
	db/polls.php