Fixed Damage rays not disappearing when things are healed.
Added sexy sexy healing effect on Generator and luna (will work on other things as well)
Minor tweaks and bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Orbion/Assets/Scenes/scene1.unity