SmokeBomb and almost working defection shield
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion

Conflicts:
	Lords-of-Distortion/Assets/Scenes/LobbyArena.unity
	Lords-of-Distortion/Assets/Scenes/MainMenu.unity
fixing layers for traps
Earthquake shatter particles
Quake Particles RPC'ed
Fixed some trap layers
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion
Merge branch 'Jason'

Conflicts:
	Lords-of-Distortion/Assets/JMO Assets/Cartoon FX/CFX2 Prefabs/Debris Hits/CFX2_GroundRockHit.prefab
	Lords-of-Distortion/Assets/Resources/FreezeTrap.prefab
	Lords-of-Distortion/ProjectSettings/TagManager.asset