Traps 1.7 & Level 2.3

Level now loads traps.
Level 2.4 & Traps 1.8
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Level.unity