fix script
commit after conflict
Merge branch 'master' into release

Conflicts:
	scriptTest1.sh
	scriptTest2.sh