Merge branch 'master' into staging

This commit is contained in:
obadz
2016-08-22 01:18:11 +01:00
69 changed files with 300 additions and 158 deletions