>
Merge branch 'master' of https://github.com/Tranzystor/MgrSoftware

Conflicts:
	Mgr.v11.suo
ff