Fix public display map and printing
Lease management implemented.
Merging conflicts.
Merge remote-tracking branch 'fao/master' into test