放到分支
Merge branch 'master' into 測試IP

Conflicts:
	apply.doc
可以

Signed-off-by: 黃翊峰 <yifenghuang@liontravel.com>
Merge branch '測試IP'

Conflicts:
	apply.doc