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)
Passive traps implemented. Space is to jump, left mouse is to attack
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion

Conflicts:
	Lords-of-Distortion/Assets/Scenes/StageOne.unity
Merge branch 'gerardo'
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion

Conflicts:
	Lords-of-Distortion/Assets/Scripts/ArenaManager.cs
Triggers are now activated by default unless a timer is set in powerspawn.
fixed timing issues on traps
use colors to differentiate enabled and disabled (armed) traps for live placement only
Bomb Flash animation effect. Should go off after 3 secs. Currently broken
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion
Bomb detonation animation re-commit
Explosion anim on the bomb now
Timer Icon updated.
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion