District new connectors

Merged the new connectors of the Districts library from Marco's fork to the master. This merge does not change the Buildings library.