Working on updating user inputs a bit.
Merge branch 'master' of https://github.com/BUFall2013/MazeGame

Conflicts:
	workspace/MazeGameServer/src/game/GameEngine.java
	workspace/MazeGameServer/src/game/entities/npcs/Player.java