Merge remote-tracking branch 'origin/Jason' into gerardo

Conflicts:
	Lords-of-Distortion/Assets/Scenes/MainMenu.unity
Added timer to powerspawn,  put in outline for armament logic with print statement
got spawning of delayed traps working
Proximity  traps placed before match working.
UI power now destroyed properly after real one spawns
Fixed traps getting destroyed too early. trigger armament working  (but buggy trigger board)
Merge branch 'gerardo'