Built SearchResults query

Also removed jdbchelper jar and added java-json jar
Merge remote-tracking branch 'origin/HW2' into HW2

Conflicts:
	.metadata/.log

	.metadata/.plugins/org.eclipse.core.resources/.projects/Team01-HW2/.indexes/e4/history.index

	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.jdt.core/3234805445.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jst.jsp.core/jspsearch/3255709627.index

	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Team01-HW2/2014/10/42/refactorings.history

	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Team01-HW2/2014/10/42/refactorings.index
	.metadata/.plugins/org.eclipse.wst.validation/dep.index
	Team01-HW2/.classpath
	Team01-HW2/build/classes/.gitignore