Initial commit of working crane platform for the trains.

Also fixed some small things.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013
Small bug fixes and protocol update.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013

Conflicts:
	Controller/src/controller/Controller.java