removed useless code
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013
Revert "FIxed bargecrane and seacrane animations"

This reverts commit e2dbd3b16a5d970eb36f19096db98becf7b40617.

Conflicts:
	Simulator/src/simulator/BargeCrane.java

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