1. Properties file changes.2. Aggregation details / aggregation object add.3. Other changes from stef
New aai branch
merged (again...) newAPI branch to trunk.
merged newAPI branch
Copying to move to dnet45