Manual merge with 'wojtek' branch

Adding build.xml
Conflicts:

	.gitignore