Small fixes
Merge branch 'master' of https://github.com/r-bergundy/Group-Project

Conflicts:
	group1/src/org/ericsson/mydb/Driver.java
	group1/src/org/ericsson/parser/ImportData.java
	group1/target/classes/org/ericsson/mydb/Driver.class
	group1/target/classes/org/ericsson/parser/ImportData.class
	group1/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
Merge branch 'master' of https://github.com/r-bergundy/Group-Project
Tests
Tests pass