-
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013.git
Changed some agv and crane things
Began with seaship crane blup
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013
Started with seacrane movement
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013

Conflicts:
	Simulator/src/simulator/Main.java
Flipped all container axes. Cranes now move correctly to the container and crane animations work. XML1 is broken.