隱私權dialog加上系統設定的公司名稱

Conflicts:
	templates/ws-fn-privacy-dialog-tpl.html

Conflicts:
	templates/ws-fn-privacy-dialog-tpl.html
Merge branch 'master2' into newtinymce