Remove TODO from TestArea
Merge remote-tracking branch 'origin/MilestoneTwo' into MilestoneTwo
Merge remote-tracking branch 'origin/MilestoneTwo' into MilestoneTwo
Merge remote-tracking branch 'origin/MilestoneTwo' into MilestoneTwo
PurchasableCardLayout: fix the calculation of minimalSize
Street: set upgradeable to false if the street is in mortgage