GitHub push 3-2-14

Macintosh sync
Merge branch 'master' of https://github.com/ameropel/Gravity

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Gravity-csharp.sln
	Gravity.sln
	Gravity.userprefs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/25/25449e5baa9085c418f54abf6a7b1688
	Library/metadata/44/44e87652c6cc9d04eb6365b9cf5118e6
	Library/metadata/58/58546189bfc5f0248b3f3d5fcd1b0a3d
	Library/metadata/75/7536ddc68de081240b1a6e9f95bbfa0d
	Library/metadata/9f/9fa503ae3940a7c4c855f2492b776084
	Library/metadata/a4/a42d66d017b681a4682bf96fea1f74fc
	Library/metadata/ae/aef9bec1fe29ac444b420a5b5740436c
	Library/metadata/dd/dd20f74529bfc174f90e529e86e017d1
	Library/metadata/e5/e5de69671402c5e439681adc7ddd1e57
	Library/metadata/f6/f670603ca070b714385edb4f540b4074
	Temp/UnityTempFile-230305b0e7bc26148a69e298e54e4a31
	Temp/UnityTempFile-cd5f0210b088474498796e33c6ab0997
	Temp/UnityTempFile-d2dd21db66f6ca04088e1276f42fce8b
	Temp/UnityTempFile-d7fbf5030518aa845aacb6e7d3eca63e
	Temp/__EditModeScene
	Temp/bin/Debug/Assembly-CSharp.dll
	Temp/bin/Debug/Assembly-CSharp.pdb
GitHub Sync