build.xml changes in progress
build.xml modified - unit tests target added plus other fixes
Merge branch 'dev'