dropping in fw v3.5.2
Merge branch 'master' into development

Conflicts:
	changelogs/configurator.html
	js/data_storage.js