Attachments now managed through ObjectsController.
Fixed merge conflicts