04/28/14 add query numbers
Merge branch 'master' of github.com:kgary/AQM_REST

Conflicts:
	build.xml
	src/edu/asupoly/heal/aqm/rest/DataResource.java