Merge branch 'master' of https://github.com/ofriberg/MoverioPS3
Merge branch 'master' of https://github.com/ofriberg/MoverioPS3

Conflicts:
	AGI_Proj2/Assets/AndroidUnity/Characters/Third Person
Character/Scripts/ThirdPersonCharacter.cs
	AGI_Proj2/Assets/Editor/QCAR/ImageTargetTextures/QR2.meta
	AGI_Proj2/Assets/Editor/QCAR/ImageTargetTextures/TestBild.meta
	AGI_Proj2/Assets/Editor/QCAR/ImageTargetTextures/algebrablock.meta
	AGI_Proj2/Assets/Sample Assets/Characters/Third Person
Character/Models/Materials.meta