RESTful fixes, galaxy converter fixes
Merge branch 'bills'

Conflicts:
	BTL-REST/nbproject/genfiles.properties
	BTL-REST/src/java/edu/usd/btl/data/TestServlet.java