Merge remote-tracking branch 'origin/master'

Conflicts:
	ChildrensHospital/Assets/Scripts/GemBehavior.cs
	ChildrensHospital/Assets/Scripts/GemGenerator.cs
forced