5279f96 Merge branch 'develop'

Merged and Committed by frantisekz 5 years ago
    Merge branch 'develop'
    
        
file modified
+0 -20
file modified
+7 -7
file modified
+8 -18
file modified
+3 -3
file modified
+10 -18
file modified
+2 -2
file modified
+38 -22
file modified
+1 -1
file modified
+8 -3
file modified
+8 -2
file modified
+11 -6
file modified
+3 -5
file modified
+0 -20
file modified
+3 -3
file modified
+17 -4