+ added OCIL merging capabilities
+ fixed bug with importing files for compliance checks which caused NPE
Authored by: bworrell 2011-07-12
Parent: [r1017]
Child: [r1019]