Recommit of electricity assets
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion
Commit before wessman meeting.
Merge branch 'master' into Jason
Hopefully arena manager keeps the sprite icons saved this time
Started making offlineplacement UI. Arenamanager no longer depends on placementUI being in scene.
Gravity Field moves left and right
Merge branch 'master' into Jason

Conflicts:
	Lords-of-Distortion/Assets/Scenes/StageOne-Two.unity
	Lords-of-Distortion/Assets/Scenes/StageOne.unity