some small changes. again I don't remember. They were insignificant though.
Merge branch 'master' of https://github.com/RyanRothweiler/Miniverse2

Conflicts:
	source/Assembly-UnityScript-Editor.pidb
	source/Assembly-UnityScript.pidb
	source/Assets/materials/UI/proximityIndicator_MAT.mat
	source/source-csharp.sln
	source/source.sln
	source/source.userprefs