SModelId: migrate models
migrate SModelId in java files
fix migration script
fix compilation after migration
fix refs in models
rebuild generators
rebuild the whole project
Merge master into snodeapi
make project after merge
Merge remote-tracking branch 'origin/master' into snodeapi
Merge remote-tracking branch 'origin/master' into snodeapi