Small change to wisp spawner and enabled/disabled in scene
Fixed merge conflict
Merge branch 'Beta' of https://github.com/esfdk/DarkForest into Beta

Conflicts:
	Assets/Scenes/Scene0.unity
	Assets/Scripts/WispSpawner.cs