Merge branch 'master' of https://github.com/hottehead/GameDevWeek

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 3 and 2 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/levelObjects/ServerBridgeSwitch.java
#	modified:   gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java
#	modified:   gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/input/InputHandler.java
#	modified:   gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/input/PlayerIntention.java
#