Merge remote-tracking branch 'origin/dev' into dev
fixed #1 The reindex functions does not consider 1:n relations