UML generatie via UML Lab van huidig project
Merge remote-tracking branch 'CalZoneVUB/master' into MyMaster
replacement to Documents repository
Css aampassing /rooms
Merge branch 'CalZoneMaster' into MyMaster
Merge branch 'CalZoneMaster' into MyMaster
Maven update made a small rearrangement of .project and added lines in setting files
Added slf4j (simple logging framework for Java) in pom
updated logging dependencies to newest versions
set the scope of the logging depencies to compile
setting up logging properties
- setting up a logging archiecture backbone
- example of class with logging
Start translation from properties file to XML, since this way the logging backbone can be configured way more datailled.
Merge branch 'CalZoneMaster' into logging

Conflicts:
	JavaServer/calzone/pom.xml
	JavaServer/calzone/target/m2e-wtp/web-resources/META-INF/maven/com.vub/calzone/pom.xml
Bugfixes na merge
Merge pull request #101 from MPieter/master

Bugfixes na merge
Persistence.xml aangepast
no message
Refactering na iteratie 2
Merge commit '574e9812167f6bf8bd02df8a0ce3b1dfb28ae9c2'