Query 4 works
Merge remote-tracking branch 'origin/master'

Conflicts:
	group1/WebContent/index.html
	group1/src/com/test/TestQueries.java
	group1/src/org/ericsson/mydb/Driver.java
	group1/target/classes/org/ericsson/mydb/Driver.class
	group1/target/classes/org/ericsson/mydb/EntityResource.class