Added container class in simulator
Merge branch 'master' of github.com:Jordi1990/Containing-2013

Conflicts:
	Controller/src/controller/Communication_packetdata.java