pc changes that I don't know so probably weren't significant
Merge branch 'master' of https://github.com/RyanRothweiler/Miniverse2

Conflicts:
	source/Assets/levels/World 1/transporter planet is by the ship - Heron.unity
	source/Assets/materials/UI/proximityIndicator_MAT.mat
	source/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	source/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	source/Library/assetDatabase3