fix inverted annotations in AbstractItem
improve update functionality on entities for detached entities
- now uses entity manager merge() instead of a load() followed by a persist()