Fixed Condition DataXML and some class names
Merge remote-tracking branch 'origin/master'