Merge branch 'master3'
Merge branch 'master4'
Merge branch 'master3'
commit
Merge branch 'master2'

Conflicts:
	Programmas/Simulatie/build/classes/mygame/Main$1.class
Merge branch 'master3'

Conflicts:
	Programmas/Simulatie/build/classes/mygame/Main$1.class
Merge branch 'master3'
Fixed pos for storage crane.
Merge branch 'master3'

Conflicts:
	Programmas/Simulatie/nbproject/private/private.properties
new version AGV, Truck, TruckCrane and Main. (logic pathfinding)
Merge branch 'master2'

Conflicts:
	Programmas/Controller/build/classes/containing/XML_Parser.class
	Programmas/Controller/src/containing/XML_Parser.java
	Programmas/Simulatie/src/mygame/Main.java
Merge branch 'master' of https://github.com/Draaky/Containing

Conflicts:
	Programmas/Simulatie/build/classes/mygame/Main$2.class
	Programmas/Simulatie/build/classes/mygame/Main.class
	Programmas/Simulatie/build/classes/mygame/Platform.class
	Programmas/Simulatie/nbproject/private/private.properties
	Programmas/Simulatie/src/mygame/Main.java
Newest version. Merge conficts fixed.