Update permissions on tests.sh
Merge branch 'master' into develop
[Fix] Changes to merge.sh to allow skipping tests or using ./tests.sh instead of tests.sh
[Fix] Changes to merge.sh to allow skipping tests or using ./tests.sh instead of tests.sh
[Fix] I seem to always forget to add spaces into shell conditionals
Remove test code
Fix permissions for deploy and composer update scripts also
Merge branch 'master' into develop

Conflicts:
	merge.sh