Update build.xml
Merge branch 'mergetest2' into mergetest1