update client project by changes in model
Merge remote-tracking branch 'origin/restructure' into restructure