Merge branch 'master' into click

This commit is contained in:
Paul Chaignon
2015-12-08 22:00:49 +01:00
10 changed files with 409 additions and 2 deletions