Removing dead code.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	MatterControl.sln