Clean up
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	klasse-wp-poll-survey.php
Clean up