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

Conflicts:
	.idea/workspace.xml
workspace
Merge branch 'develop' of https://github.com/gsalgun/GreedyUSO into develop

Conflicts:
	.idea/workspace.xml
textures in progress
Merge branch 'develop' of https://github.com/gsalgun/GreedyUSO into develop

Conflicts:
	core/src/main/java/GreedyUSO/core/view/GameScreen.java
	core/target/classes/GreedyUSO/core/view/GameScreen$1.class
	core/target/classes/GreedyUSO/core/view/GameScreen.class
textures
fixed tracked files
Merge branch 'develop' of https://github.com/gsalgun/GreedyUSO into textures

Conflicts:
	.idea/workspace.xml
	core/src/main/java/GreedyUSO/core/view/GameScreen.java
	core/target/classes/GreedyUSO/core/view/GameScreen$1.class
	core/target/classes/GreedyUSO/core/view/GameScreen.class