updated tostrings for entity and added additional constructor for entity
Merge remote-tracking branch 'origin/dev' into server_test_multi

Conflicts:
	src/entities/Asteroid.java
	src/entities/Entity.java
	src/gameObjects/PlayerObject.java
Update with server sending data