EVO options
Merge branch 'master' of https://github.com/Chargeorge/Studio2

Conflicts:
	AWorld/Assets/InControl/InControlLibrary/VersionInfo.cs