...
Merge branch 'model' of https://github.com/gormed/ubicomp_h5n1 into model