Particles some fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Tooltip.cs
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 1897342372300d081efa74b1b86553533e76aa9a.