Merge branch 'release/2.0.0' into dev
Merge branch 'dev' of github.com:zufrieden/uxlausanne into dev