Beginning tool development
Added features
Merge branch 'develop'

Conflicts:
	TODO
	src/toolbox/Toolbox.cpp