Color
Merge branch 'master' of https://github.com/Dracir/semicolon

Conflicts:
	Assets/Scripts/GameObjects/Tether/ParameterTether.cs