settings edited
Merge branch 'develop' of https://github.com/klassebe/klasse-wp-poll-survey into develop

Conflicts:
	js/hbs_templates/control_panel.hbs
Merge branch 'develop' of https://github.com/klassebe/klasse-wp-poll-survey into develop