Merge branch 'master' into ui-2

This commit is contained in:
Jaco Greeff
2017-07-10 17:43:37 +02:00
24 changed files with 1266 additions and 29 deletions