just commited because i had to, no changs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/M_Scripts/HS_Manager.cs