Merge branch 'master' of gricad-gitlab.univ-grenoble-alpes.fr:python-uga/py-training-2017

2 jobs for master in 1 minute and 5 seconds (queued for 3 seconds)