Merge
Merge branch 'develop' of https://github.com/BrainProject/UnityTemp into feature/SocialGame
try of stickman model
Merge branch 'develop' into feature/SocialGame

Conflicts:
	Assets/Minigames/SocialGame/GUI/Stickman.prefab.meta
	Assets/Minigames/Tonda Project/PointAvatar/Materials/U_Character_Body-DIF.mat.meta
	Assets/Models/Materials/Material.mat
	Assets/Models/Materials/Material.mat.meta
	Assets/Resources/_KinectManager.prefab.meta
	Assets/Scenes/Minigames/SocialGame.unity
	Assets/Scripts/Game Selection/LevelManagerSelection.cs.meta
	Assets/Textures/Temporary.meta
	Assets/Textures/Temporary/A.png.meta
	Assets/Textures/Temporary/B.png.meta
	Assets/Textures/Temporary/C.png.meta
	Assets/Textures/Temporary/D.png.meta
Merge branch 'develop' into feature/SocialGame
Merge branch 'develop' into feature/SocialGame
add new models of avatar,
two players and butterfly game
Merge branch 'develop' into feature/SocialGame
add trivial game for two user with flower, absolut finish game cycle.
Merge branch 'feature/SocialGame' of https://github.com/BrainProject/UnityTemp into develop

Conflicts:
	Assets/Minigames/SocialGame/GUI/Stickman.fbx.meta