Starting with uv work :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mEngine/interactive/gameObjects/Entity.java
	src/mEngine/interactive/gameObjects/Player.java