Merge remote-tracking branch 'origin/master'

Conflicts:
	UnityFolder/Assets/scene1.unity
	UnityFolder/UnityFolder.userprefs

Merge remote-tracking branch
'origin/master'

Conflicts:
	UnityFolder/Assets/scene1.unity
	UnityFolder/UnityFolder.userprefs

update
Merge remote-tracking branch 'origin/master'

Conflicts:
	UnityFolder/Assets/scene1.unity
	UnityFolder/UnityFolder.userprefs