9371e9c Merge branch 'develop'

Merged and Committed by frantisekz 5 years ago
    Merge branch 'develop'
    
        
file modified
+88 -47
file modified
+24 -29
file modified
+3 -3
file modified
+18 -18
file modified
+3 -0
file modified
+26 -7
file modified
+2 -2
file modified
+1 -1
file modified
+4 -5
file modified
+1 -1
file modified
+1 -1
file modified
+5 -5