my new changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	SampleThirdPersonShooter/Assets/Scenes/NEWCHANGES.unity
	SampleThirdPersonShooter/Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Textures/constructor_diffuse.png
	SampleThirdPersonShooter/Library/CurrentLayout.dwlt
	SampleThirdPersonShooter/Library/CurrentMaximizeLayout.dwlt
	SampleThirdPersonShooter/Library/assetDatabase3
	SampleThirdPersonShooter/Library/expandedItems

	SampleThirdPersonShooter/Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761