Preparing to merge with master.

small conflicts with entries in Agents table. I'm not sure these entries are required.

Conflicts:
	src/MCPServer/share/mysql