wade 15:41
Merge branch 'master' of github.com:cyndiWade/market

Conflicts:
	Home/Common/common.php
	Home/Conf/config.php
	Home/Lib/Action/ApiBaseAction.class.php
	Home/Lib/Action/ApiCollectAction.class.php
	Home/Lib/Action/ApiDiscountAction.class.php
	Home/Lib/Action/ApiJoinAction.class.php
	Home/Lib/Action/ApiLoginAction.class.php
	Home/Lib/Action/ApiMessageAction.class.php
	Home/Lib/Action/ApiOpenFireAction.class.php
	Home/Lib/Action/ApiSendAction.class.php
	Home/Lib/Action/ApiUserAction.class.php
	Home/Lib/Action/BaseAction.class.php
	Home/Lib/Action/HtmlBaseAction.class.php
	Home/Lib/Action/HtmlJoinAction.class.php
	Home/Lib/Action/IndexAction.class.php
	Home/Lib/Model/BaseModel.class.php
	Home/Lib/Model/CityModel.class.php
	Home/Lib/Model/CollectModel.class.php
	Home/Lib/Model/FileModel.class.php
	Home/Lib/Model/JoinModel.class.php
	Home/Lib/Model/SystemInfoModel.class.php
	Home/Lib/Model/SystemMessageModel.class.php
	Home/Lib/Model/UsersModel.class.php
	Home/Lib/Model/VerifyModel.class.php
	Home/Lib/ORG/Util/Image.class.php
	Home/Lib/ORG/Util/Page.class.php
	Home/Lib/ORG/Util/String.class.php
	Home/Lib/ORG/Util/UploadFile.class.php
	Home/Lib/Tool/SHP.class.php
	Home/Lib/Tool/UploadFile.class.php
	Home/Lib/Tool/Validate.class.php
	Home/Public/css/ie.css
	Home/Public/css/layout.css
	Home/Public/images/breadcrumb_divider.png
	Home/Public/images/btn_submit.png
	Home/Public/images/btn_submit_2.png
	Home/Public/images/btn_view_site.png
	Home/Public/images/header_bg.png
	Home/Public/images/header_shadow.png
	Home/Public/images/icn_add_user.png
	Home/Public/images/icn_alert_error.png
	Home/Public/images/icn_alert_info.png
	Home/Public/images/icn_alert_success.png
	Home/Public/images/icn_alert_warning.png
	Home/Public/images/icn_audio.png
	Home/Public/images/icn_categories.png
	Home/Public/images/icn_edit.png
	Home/Public/images/icn_edit_article.png
	Home/Public/images/icn_folder.png
	Home/Public/images/icn_jump_back.png
	Home/Public/images/icn_logout.png
	Home/Public/images/icn_new_article.png
	Home/Public/images/icn_photo.png
	Home/Public/images/icn_profile.png
	Home/Public/images/icn_search.png
	Home/Public/images/icn_security.png
	Home/Public/images/icn_settings.png
	Home/Public/images/icn_tags.png
	Home/Public/images/icn_trash.png
	Home/Public/images/icn_user.png
	Home/Public/images/icn_video.png
	Home/Public/images/icn_view_users.png
	Home/Public/images/module_footer_bg.png
	Home/Public/images/post_message.png
	Home/Public/images/secondary_bar.png
	Home/Public/images/secondary_bar_shadow.png
	Home/Public/images/sidebar.png
	Home/Public/images/sidebar_divider.png
	Home/Public/images/sidebar_shadow.png
	Home/Public/images/table_sorter_header.png
	Home/Public/js/hideshow.js
	Home/Public/js/jquery-1.5.2.min.js
	Home/Public/js/jquery.equalHeight.js
	Home/Public/js/jquery.tablesorter.min.js
	Home/Runtime/Cache/06b89938c679c503d5eba63bdc91b3d6.php
	Home/Runtime/Cache/6d6ba9605b3cfe713cf68d57430cfea6.php
	Home/Runtime/Cache/8858705d106df6b79a22f636add8a07d.php
	Home/Runtime/Cache/8de68174c774cd3e6a187dd4b3558621.php
	Home/Runtime/Cache/93346970f163c35389233b9ee66fde42.php
	Home/Runtime/Cache/cd00b57f71657c777f33bf7d64f30bda.php
	Home/Runtime/Cache/e6a0035b4f357bf3ef1f8c906c8aa93f.php
	Home/Runtime/Cache/ef340c1aa2f6b131043fc496b13fcca0.php
	Home/Runtime/Data/_fields/lehuo.file.php
	Home/Runtime/Data/_fields/lehuo.join.php
	Home/Runtime/Data/city_cache.php
	Home/Runtime/Logs/1378443039-13_09_06.log
	Home/Runtime/Logs/13_08_11.log
	Home/Runtime/Logs/13_08_15.log
	Home/Runtime/Logs/13_08_16.log
	Home/Runtime/Logs/13_08_19.log
	Home/Runtime/Logs/13_08_20.log
	Home/Runtime/Logs/13_08_21.log
	Home/Runtime/Logs/13_08_22.log
	Home/Runtime/Logs/13_08_23.log
	Home/Runtime/Logs/13_08_26.log
	Home/Runtime/Logs/13_08_27.log
	Home/Runtime/Logs/13_09_02.log
	Home/Runtime/Logs/13_09_05.log
	Home/Runtime/Logs/13_09_06.log
	Home/Runtime/Logs/13_09_09.log
	Home/Runtime/Logs/13_09_12.log
	Home/Runtime/Logs/13_09_13.log
	Home/Runtime/Logs/13_09_22.log
	Home/Runtime/Logs/13_09_23.log
	Home/Runtime/Logs/13_09_27.log
	Home/Runtime/Logs/14_01_15.log
	Home/Tpl/HtmlJoin/auditing.html
	Home/Tpl/HtmlJoin/edit.html
	Home/Tpl/HtmlJoin/index.html
	Home/Tpl/Login/city.html
	Home/Tpl/Login/collect.html
	Home/Tpl/Login/join.html
	Home/Tpl/Login/register.html
	Home/Tpl/Login/sendSHP.html
	Home/Tpl/Public/menu.html
	Home/Tpl/Public/top.html
	config.inc.php
	index.php