按鈕正常
Merge branch 'master' of https://github.com/MINMINNCU/components

Conflicts:
	com_comment/controllers/quotation.php