Merge remote-tracking branch 'origin/master'

Conflicts:
	db/dataBase.db
	vote_poll_body.php