fixing up build.xml
Merge branch 'develop' of git://github.com/pcpratts/rootbeer1 into develop

Conflicts:
	build.xml