updated build.xml
updated project and kept debugging stuff
delete build.xml to remove merge fails