調整faq搜尋參數的投入

Conflicts:
	faq.php
Merge branch 'master2' into newtinymce