Fixing bug
Merge branch 'master' into inspector_testing

Conflicts:
	server/AmberTools.Inspector.changes