Merge pull request #175 from nicocarraggi/nicodev

Database restructured
IP: Schedular Dashbaord
Database restructured
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Merge pull request #176 from nicocarraggi/nicodev

Werkende LoadDump.
IP: Schedular Dashboard
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Werkende LoadDump.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Opstellen test folder
Merge branch 'testing'
HALF WERKENDE Services: nog niet alle lazy calls enz opgelost.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge pull request #178 from nicocarraggi/nicodev

Nicodev
Basistests toegevoegd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'testing'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/service/UserService.java
Saving Trajects
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Traject Paginization + Set<> in stead of List<>