i
changes added
Merge branch 'master' of git://github.com/SjefvLoo/tue-2io23
Merge branch 'master' of git://github.com/Alchiadus/tue-2io23

Conflicts:
	src/ogo/spec/game/model/Creature.java
Fixed flipped x and y coordinates over network.
Merge branch 'master' of https://github.com/kokx/tue-2io23.git
Merge branch 'master' of https://github.com/kokx/tue-2io23
Fixed compiler error in the creature.
Merge branch 'master' of https://github.com/kokx/tue-2io23
Fixed bug on getting the wrong creature ID.
Debug can now be toggled.
Added advanced debug messages.
Merge branch 'master' of https://github.com/kokx/tue-2io23
Improved debug message.
Improved debug message.
Merge branch 'master' of git://github.com/maikelsteneker/tue-2io23

Conflicts:
	src/ogo/spec/game/graphics/view/Base.java
Merge branch 'master' of https://github.com/kokx/tue-2io23
Fixed debug toggle.
Improved debug message.
Temporarily disabled energy.