Merge branch 'master' of https://github.com/Jordi1990/Containing-2013

Conflicts:
	Controller/src/controller/AGV.java
	Controller/src/controller/Controller.java
	Controller/src/controller/TruckPlatform.java
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013