Merge branch 'mapterminal' into healthbar

Conflicts:
	Assets/Scripts/Raptor Scripts/RaptorInteraction.cs