log錯誤，並依設定顯示或隱藏錯誤訊息
Merge branch 'master2' into newtinymce

Conflicts:
	.gitignore