Cleans up the 'base' file of the plugin
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	klasse-wp-poll-survey.php