Merge branch 'master' of https://github.com/ahusba/Gamejam

Conflicts:
	game1/Assets/Scene/KinectSample.unity
	game1/Library/CurrentLayout.dwlt
	game1/Library/assetDatabase3
	game1/Library/expandedItems
	game1/Library/shadercompiler-1.log