Commit
Merge branch 'master' of https://github.com/CKovacs/JnRProject

Conflicts:
	JnR/Assembly-UnityScript-Editor-vs.unityproj
	JnR/Assembly-UnityScript-Editor.unityproj
Merge branch 'master' of https://github.com/CKovacs/JnRProject
Skill stuff