Player respawn
Merge branch 'master' of github.com:SpaceTeam/MicroSpace

Conflicts:
	MicroSpace/src/com/punchline/microspace/entities/templates/PlayerTemplate.java
	MicroSpace/src/com/punchline/microspace/entities/templates/structures/BaseShipTemplate.java