gallery圖片尺寸設定區分分類及內容圖片

Conflicts:
	conf/config.inc.php
登入表單帳號欄位顯示email的說明
Merge branch 'master' into newtinymce
首頁的gallery_list
首頁最新消息增加小圖及簡述欄位
Merge branch 'master2' into newtinymce
修正gallery分頁連結
Merge branch 'master' into newtinymce
修改formvalida設定變數名稱
後台ajax儲存products套表單驗證

Conflicts:
	cmsadmin/templates/ws-manage-products-form-tpl.html
Merge branch 'master' into origin

Conflicts:
	cmsadmin/templates/ws-manage-products-form-tpl.html
修正後台download選擇縮圖功能(for newtinymce)
後台產品分類編輯頁使用tinymce2編輯器設定
後台說明文字用css
產品分類轉址設定
Merge branch 'master2' into newtinymce

Conflicts:
	cmsadmin/products.php
增加aboutus subcate

Conflicts:
	conf/config.auth.php
調整au_cate的rewrite rule範例
Merge branch 'master2' into newtinymce
應用領域改寫為多層次

Conflicts:
	cmsadmin/css/common.css