[TM ONLY] Master controller updates#336

flleeppyy wants to merge 4 commits into

Monkestation:masterMonkestation/Monkeris:masterfrom

flleeppyy:master-controller-updatesflleeppyy/Monkeris:master-controller-updatesCopy head branch name to clipboard