消費者自行取消訂單開關

Conflicts:
	conf/config.auth.php
Merge branch 'master' into newtinymce