formatted build.xml, added supertypes in help screen
Merge remote-tracking branch 'origin/master'

Conflicts solved:
	build.xml