Merge branch 'release/2.1.0' into dev
Merge pull request #27 from gillesdemarty/dev

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