測試自動化佈屬
solve conflice

Conflicts:
	deploy-to-master.sh
Merge branch 'master' into dev