Merge branch 'database' of https://github.com/utwente-di/di15 into database
raboparser gefixt.
raboparser gefixt + rabofile
Merge branch 'parser' of https://github.com/utwente-di/di15 into database
Updated test
Merge / Diverge conflicts
Merge branch 'database' into master_Test