fixed a name bug
Merge branch 'master' of https://github.com/dracul89/unhandledException

Conflicts:
	Team Project Game/src/javaGame/CharacterScreen.java
	Team Project Game/src/javaGame/MapScreen.java

updates several character screen and some mapscreen stuff