Update build.xml with a "release" target to create a release zip file
Fixed Merging issues