update model and code
Merge branch 'master' of https://github.com/FTSRG/mondo-collab-framework.git