modified some scripts
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity Project/Library/CurrentLayout.dwlt
	Unity Project/Library/metadata/1e/1e4d7b5a4d1c31943b692b355f375c2d