changed testing.sh in the hotfix branch
changed testing.sh from master as well
Merge branch 'hotfix'

Conflicts:
	testing.sh