Merge remote-tracking branch 'mike/master' into dev

This commit is contained in:
Mario Vavti
2018-01-11 08:46:13 +01:00
18 changed files with 20 additions and 13 deletions