Merge from branch (remove cardinality operator).

Removed cardinality operator.
Updated connectors in Districts library.
Did various small improvements.