Fixed final bugs
Merge branch 'master' of https://github.com/CMastar/BeneathTheSurface

Conflicts:
	Unity/Unity-csharp.sln
	Unity/Unity.sln