Database inside Calzone
Merge pull request #7 from nicocarraggi/master

Database inside Calzone
Merge prefaration
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TestBD3

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/db/DbConfigFile.java
	JavaServer/calzone/src/main/java/com/vub/db/DbLink.java
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java