Made some modifications to ant files
Merge
Merge