Added handler to UI, and connection fixes.
Pull fix (?)
Pull fix 2..
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013

Conflicts:
	Controller/src/controller/StorageCrane.java
	Controller/src/controller/StorageParking.java
	Controller/src/controller/TrainPlatform.java
	Controller/src/controller/TruckPlatform.java
	Simulator/src/simulator/Agv.java
	Simulator/src/simulator/BargeCrane.java
	Simulator/src/simulator/Main.java
	Simulator/src/simulator/SeaCrane.java
	Simulator/src/simulator/StorageCrane.java