Merge branch 'master' of https://github.com/ecolehetic/H3P2017-G1

Signed-off-by: fpumir <fpumir@terredeweb.fr>
Merge branch 'master' of https://github.com/ecolehetic/H3P2017-G1