AMENDED AND RESTATED DEVELOPMENT/MASTER AGREEMENT