Added skybox folder to assets
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data/Data.userprefs
	Data/Library/CurrentLayout.dwlt
	Data/Library/ScriptAssemblies/Assembly-CSharp.dll
	Data/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Data/Library/assetDatabase3