Merge
Merge branch 'develop' of https://github.com/gsalgun/GreedyUSO into HEAD

Conflicts:
	core/src/main/java/GreedyUSO/core/model/Entity.java
	core/src/main/java/GreedyUSO/core/view/GameScreen.java
	core/target/classes/GreedyUSO/core/model/Entity.class
	core/target/classes/GreedyUSO/core/view/GameScreen$1.class
	core/target/classes/GreedyUSO/core/view/GameScreen.class
Merging