manual merge with 'wojtek' branch

Adding build.xml