some bugfixing in Machine controller, made entity insertion to be dependent on file insertion
some bugfixing in Machine controller, made entity insertion to be dependent on file insertion

HeliosInteractive/Phoenix,sepehr-laal/Phoenix,sepehr-laal/Phoenix,sepehr-laal/Phoenix,HeliosInteractive/Phoenix,sepehr-laal/Phoenix,HeliosInteractive/Phoenix,HeliosInteractive/Phoenix