Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/GameAssets/Material.meta
	Assets/GameAssets/Textures.meta
	Assets/Sample Assets/Cross Platform Input/Scripts/Editor.meta
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/scene1.unity