Merged remote branch into local
Merge branch 'master' of github.com:pmourlanne/suburbia
Made it so that EventResourceAdjustment contains the TileInstance who cause the adjustment