Merged code

Merged code from other project (base.properties, new targets in
build.xml) and revised the build/clean targets for Bamboo usage.