update scripts
update scripts
script
Merge remote-tracking branch 'origin/master'

Conflicts:
	AutoTesting/home/.idea/workspace.xml
update scripts