update build.xml
Merge branch 'master' of github.com:giagiannis/matching

Conflicts:
	build.xml