Fix parse
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/controller/MainController.java
better delivery view
Fix DeliverySheet loading id
Remove import