1
Merge branch 'wx' of github.com:librajt/temp into gh-pages

Conflicts:
	wx/css/g.css
	wx/html/aboutSeller.html
	wx/html/category.html
	wx/html/categoryList.html
	wx/html/confirm.html
	wx/html/detail.html
	wx/html/home.html
	wx/html/orders.html
	wx/html/process.html
	wx/html/success.html
	wx/image/iGlobal.png
	wx/image/iGlobal.psd
	wx/image/iNav.png
	wx/image/iNav.psd
	wx/image/iSel.png
	wx/image/iSel.psd
	wx/image/loading.gif
	wx/image/loading.psd
	wx/index.html
	wx/js/jquery-2.0.3.min.js
	wx/js/jquery.bxslider.min.js
	wx/js/numberic.js
	wx/shtml/aboutSeller.shtml
	wx/shtml/category.shtml
	wx/shtml/categoryList.shtml
	wx/shtml/confirm.shtml
	wx/shtml/detail.shtml
	wx/shtml/home.shtml
	wx/shtml/inc/_head.shtml
	wx/shtml/inc/_link_g.shtml
	wx/shtml/inc/category.shtml
	wx/shtml/inc/loadMore.shtml
	wx/shtml/inc/order.shtml
	wx/shtml/inc/sell.shtml
	wx/shtml/inc/sell2.shtml
	wx/shtml/inc/toolbar.shtml
	wx/shtml/orders.shtml
	wx/shtml/process.shtml
	wx/shtml/success.shtml