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

Conflicts:
	scriptTest1.sh
	scriptTest2.sh
merge new_folder from master branch
MERGE FROM MASTER: fixed file in new_folder
new commit
add folder 3
new modules
commit tryHook.sh
Merge branch 'release' into github_master
as