Merge branch 'master' of https://github.com/cdeboeuf/GestStock.git