Merge proposals dependent on lp:~numerigraphe-team/openobject-server/trunk-search-category-child-of

1. trunk-search-category-child-of
2. Dependent merge proposals