513f245 Merge branch 'develop'

Merged and Committed by frantisekz a year ago
    Merge branch 'develop'
    
        
file modified
+2 -2
file modified
+13 -1
file modified
+39 -42
file modified
+9 -1
file modified
+2 -0
file modified
+105 -3
file modified
+12 -0
file modified
+1 -1
file modified
+22 -1
file modified
+45 -14
file modified
+2 -2
file modified
+1 -5
file modified
+3 -0
file modified
+2 -30
file modified
+1 -0
file modified
+1 -0