fixt same issue as master
Butts butts butts
Revert "Butts butts butts"

This reverts commit d278e7890dcc1e5f5d61dc6a7fb28eed748dc013.
lol ik vergeet altij dme punt comma's
Revert "lol ik vergeet altij dme punt comma's"

This reverts commit 849cbda32f24d7110e63440fb955ed9e1bfb78cd.
etagerae5zArge
hhhhh
printline stuk Jurgen Snijders toegevoegd en mijn naam
Merge origin/InDev into InDev

Conflicts:
	src/corendon/bagagesystem/is101/pkg1/pkg2014/CorendonBagageSystemIS10112014.java
removed code
changed layout of packages, changed location of UI to folder view, added connectivity from FYS architect, included libs from FYX architect
Merge branch 'master' into InDev
Merge branch 'InDev'
fix conflict
Merge branch 'master' of https://github.com/FatalErrorXz/corbagage-is101-1-2104