Merge commit 'f2a51b0f146ca154797de507ae54ded9942204aa' into Jason
Merge branch 'master' into Jason
Merge branch 'master' into Jason
Number label now shows according to power trigger key if the power is an active.
Prevent duplicate icons for powers from showing up on the trigger grid.
Merge branch 'master' into Jason
Removed. Code only worked while dead. Icons and key presses broke during gameplay
Merge branch 'master' into Jason
Merge branch 'Jason' of https://github.com/RobbSteel/Lords-of-Distortion into Jason
Merge branch 'master' into Jason

Conflicts:
	Lords-of-Distortion/Assets/Scenes/StageOne.unity
Trigger Grid and Inventory Grid are merged to the same grid
instant placement
players have infinite powers when dead
switch to all triggers
Changed gravityfield and smokebomb to work with triggers again.

Updated PlacementUI to show triggers for passives
Merge branch 'master' into Jason

Conflicts:
	Lords-of-Distortion/Assets/Scenes/MainMenu.unity
Merge branch 'master' into Jason
Fixed Resupply to be random.

Trigger color updates when it can be activated
Added PowerSlot tag to PowerSlot prefab.

Changed Resupply so that players can only have a max of 2 powers on the screen and their inventory at any given time.
Merge branch 'master' into Jason