Merge branch 'custom_forms' of https://github.com/gltn/stdm-plugin into custom_forms

Conflicts:
	ui/entity_browser.py