finished with models (almost, only thesis left)
Merge branch 'waterlink_backend' of github.com:waterlink/conference-ci into waterlink_backend