Updated project base
Merge branch 'master' of https://github.com/margaritaG/testingtool.git

Conflicts:
	jatege/src/main/java/ch/ethz/inf/sae/jatege/TestGenerator.java