updated all the xml rules
Merge branch 'branch1'