ac0b64e Merge branch 'develop' into 'master' for 0.4.8 release

Merged and Committed by tflink 8 years ago
    Merge branch 'develop' into 'master' for 0.4.8 release
    
        
file modified
+3 -0
file modified
+1 -27
file modified
+1 -1
empty file added
file modified
+50 -3
file modified
+5 -5
file modified
+14 -7
file modified
+4 -9
file modified
+31 -46
file modified
+124 -9
file modified
+9 -1
file modified
+1 -1
file modified
+3 -0
file modified
+6 -6
file modified
+5 -8
file modified
+2 -2
file modified
+5 -0
file modified
+1 -6
file modified
+23 -16