Merge in the upstream changes

* This will require a migration to be run
Merge pull request #52 from kehh/updateUpstream20140604

Merge in the upstream changes
Update to installation profile including changes for preliminary zoology import

* Adding collection and donation to object acquisition types
* Adding subadult and adult to life stage
* empty xml elements now exporting <properly />
Merge pull request #53 from kehh/updateProfile20140605

Update to installation profile including changes for preliminary zoology...