-
Merge branch 'origin/development'

Conflicts:
	python_toolbox/misc_tools/__init__.py
	python_toolbox/misc_tools/misc_tools.py