47ece3b Merge branch 'devel'

Merged and Committed by leamas 7 years ago
    Merge branch 'devel'
    
        
file modified
+25 -0
file modified
+8 -5
file modified
+34 -6
file modified
+31 -66
file modified
+23 -66
file modified
+72 -0
file modified
+51 -9
file modified
+2 -0
file modified
+1 -1
file modified
+2 -11
file modified
+6 -24
file modified
+6 -4
file modified
+17 -344
file modified
+1 -1
file modified
+1 -1