Merge existing code
Build bullshit
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/view/DeliveryCollapsiblePane.java
toggle
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/view/MainFrame.java