admin
Merge branch 'master' of https://github.com/ChanMo/inspur

Conflicts:
	app/Lib/Action/Admin/CustomerAction.class.php
	app/Lib/Action/Admin/IndexAction.class.php
	app/Tpl/Admin/Customer/info.html
	app/Tpl/Admin/Customer/ls.html
	app/Tpl/Admin/Public/header.html
	app/Tpl/Admin/Public/images/ArrOff.png
	app/Tpl/Admin/Public/images/ArrOn.png
	app/Tpl/Admin/Public/images/TopBg.png
	app/Tpl/Admin/Public/images/aaOff.png
	app/Tpl/Admin/Public/images/aaOn.png
	app/Tpl/Admin/Public/images/btn_a.gif
	app/Tpl/Admin/Public/images/btn_b.gif
	app/Tpl/Admin/Public/images/btn_login.png
	app/Tpl/Admin/Public/images/btn_w.gif
	app/Tpl/Admin/Public/images/calendar.png
	app/Tpl/Admin/Public/images/gm_l_f.gif
	app/Tpl/Admin/Public/images/header_bg.gif
	app/Tpl/Admin/Public/images/html_clew_box.gif
	app/Tpl/Admin/Public/images/ico_top_btm.gif
	app/Tpl/Admin/Public/images/ioc_L.gif
	app/Tpl/Admin/Public/images/ioc_xx.gif
	app/Tpl/Admin/Public/images/left_bg.gif
	app/Tpl/Admin/Public/images/left_top_bg.png
	app/Tpl/Admin/Public/images/login_box_bg.jpg
	app/Tpl/Admin/Public/images/logo.jpg
	app/Tpl/Admin/Public/images/nav_tab.gif
	app/Tpl/Admin/Public/images/nav_tab.jpg
	app/Tpl/Admin/Public/images/pic.png
	app/Tpl/Admin/Public/images/submenuA.gif
	app/Tpl/Admin/Public/images/submenuB.gif
	app/Tpl/Admin/Public/images/th_bg.gif
	app/Tpl/Admin/Public/images/top_line.gif
	app/Tpl/Admin/Public/images/top_line_l.gif
	app/Tpl/Admin/Public/images/topic_arr.gif
	app/Tpl/Admin/Public/images/zw.gif
	app/Tpl/Admin/Public/images/zw_img.gif