merge commit
Merge branch 'master' of https://github.com/vikpek/BerlinJam

Conflicts:
	LeapMotionProject/Assembly-CSharp-Editor-vs.csproj
	LeapMotionProject/Assembly-CSharp-Editor.csproj
	LeapMotionProject/Assembly-CSharp-vs.csproj
	LeapMotionProject/Assembly-CSharp.csproj
	LeapMotionProject/LeapMotionProject-csharp.sln
	LeapMotionProject/LeapMotionProject.sln
	LeapMotionProject/LeapMotionProject.userprefs
Merge branch 'master' of https://github.com/vikpek/BerlinJam

Conflicts:
	LeapMotionProject/LeapMotionProject.userprefs