update
unmapconditions moved to conditionable
modifier moved to association
fixed docblock
added manytoone