commit before pull..
Merge branch 'master' of https://github.com/CKovacs/JnRProject

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