dea8152 Merge branch 'f20' into f19

Merged and Committed by bruno 9 years ago
    Merge branch 'f20' into f19
    
        
file added
+159
file added
+33
file modified
+13 -1