Fixed issue with upgrade towns

Fixed hp to max out after an upgrade. Corrected tower, house and church
placement to look nice in all upgrade levels