teleporter weapon coliders
fixed
Merge origin/master

Conflicts:
	nbproject/private/private.xml
	src/Game/Entity/Entity.java
	src/Game/Entity/Player.java