several smaller changes, adapted build.xml
Merge branch 'master' of github.com:handtwerk/sugar

Conflicts:
	README.md