-fixed skill icon views
Merge branch 'master' of https://github.com/vinicz/potential-octo-adventure

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-UnityScript-Editor-vs.unityproj
	Assembly-UnityScript-Editor.unityproj