Merge branch 'master' into 0.1

Conflicts:
Assets/Scenes/Main.unity
Library/ScriptAssemblies/Assembly-CSharp.dll
Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Library/assetDatabase3
Library/guidmapper
Temp/__EditModeScene
Vertigo-csharp.sln
Vertigo.sln
Vertigo.userprefs
added prefab for st, fixes for st