Cleanup database.
Cleanup database, now able to create residential.
Fixed merge issues.