Research Tab modification
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/02_Galaxy.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/metadata/16/164041f4436688340b26005aecbd235c
	Library/metadata/17/174998b808aa061499ad764265b93b4d
	Library/metadata/26/26a533069f2dfb246ad9c09585ac0d5b
	Library/metadata/33/330285e18f0475b4ea7083a6a32d085e
	Library/metadata/36/36557edab8bed9049b1465f1a3f06a2b
	Library/metadata/79/798d75456bff8a04ba95a8c6c98050ce
	Library/metadata/7f/7fa34506dc6c3f04e82ceae29820c7ed
	Library/metadata/88/88e34f5840de56447927cddbca14b32b
	Library/metadata/a0/a07ebd6e95c30e944ba2a6d07d3ad529
	Library/metadata/a8/a85194e3e3d207c42aaaecff9c34897f
	Library/metadata/b7/b763b111192bba64a9406952e9146155
	Library/metadata/ba/bade94eef15ebf04997bc97a89d97e82
	Library/metadata/bc/bc2f600bbfb81304eba2553b4502a2b6
	Library/metadata/ca/ca76d58662a25724e91073d271e72092
	Library/metadata/d7/d702b9274e7d24b49bba8675fcf90c29
	Library/metadata/f2/f262d77dd275a0548bbb4e9b529712d9
	Library/metadata/f9/f9020d064ac7061459260356d5885be8
	Library/metadata/fc/fcfbc941000e98542a4bc6d1a3f6aad5
	Library/shadercompiler-1.log
	Red-Way.userprefs