Diagram/Map now uses new simulator. Dependency to old simulator removed. Map drawn in just black though.
Added colors to areas in map -- NOTE: model for ResourceStyle extended. You need to clear your python database or migrate database using a migration tool