merge trunk
still some problems
corrected problems
wip
added doc
[IMP] added new field x2many_counter