uncommented stuff and changed the build xml file
Merge origin/master