trap - it's done, I think...
Merge branch 'v0.7.0' of https://github.com/ZPZ-Gr2/AwesomeGameInSpace into v0.7.0

Conflicts:
	Game/Assets/Scenes/testScene.unity
	Game/Assets/Scripts/Weapon/Trap.cs
	Game/Assets/Scripts/Weapon/TrapInteractive.cs