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

Conflicts:
	build.xml