Merge branch 'master' into develop
fixed version number
updated junit to newer version
removed image loads
Fixed the unecessary image loading
fixed error in log4j.xml
Fixed the junit deprecated methods
Fixed the pmd warnings
fixed pmd warnings
Merge branch 'develop' of https://github.com/joukojo/testgame into develop

Conflicts:
	src/main/java/com/github/joukojo/testgame/Player.java
	src/main/resources/log4j.xml
unecessarires
Fixed the pmd errors
Fixed the PMD errors
fixed pmds
fixed PMD errors
fixed PMD errors
fixed PMD errors
fixed PMD errors
fixed PMD errors
fixed PMD errors