Conflicts:
	wp-content/plugins/tospur/Admin/introduction.php
	wp-content/plugins/tospur/Admin/views/introduction.html

Conflicts:
	.htaccess
	wp-content/plugins/tospur/Admin/House.php
	wp-content/plugins/tospur/Admin/feature.php
	wp-content/plugins/tospur/Admin/newHouseList.php
	wp-content/plugins/tospur/Admin/rentHouse.php
	wp-content/plugins/tospur/Admin/rentHouseList.php
	wp-content/plugins/tospur/Admin/secHandHouse.php
	wp-content/plugins/tospur/Admin/secHandHouseList.php
	wp-content/plugins/tospur/Admin/views/add_feature.html
	wp-content/plugins/tospur/Admin/views/feature_list.html
	wp-content/plugins/tospur/Admin/views/newHouseList.html
	wp-content/plugins/tospur/Admin/views/newhouse.html
	wp-content/plugins/tospur/Admin/views/rentHouse.html
	wp-content/plugins/tospur/Admin/views/rentHouseList.html
	wp-content/plugins/tospur/Admin/views/secHandHouse.html
	wp-content/plugins/tospur/Admin/views/secHandHouseList.html
	wp-content/plugins/tospur/Dao/InsertDao.php
	wp-content/plugins/tospur/Dao/SearchDao.php
	wp-content/plugins/tospur/Tools/Core.php
	wp-content/plugins/tospur/Tools/Image.php
	wp-content/plugins/tospur/consultant_score.php
	wp-content/plugins/tospur/handle_view_house.php
	wp-content/plugins/tospur/index.php
	wp-content/plugins/tospur/view_house.php
	wp-content/themes/tospur/const.php
	wp-content/themes/tospur/consultant_info.php
	wp-content/themes/tospur/consultant_list.php
	wp-content/themes/tospur/css/consultantShop.css
	wp-content/themes/tospur/css/detail.css
	wp-content/themes/tospur/dao.php
	wp-content/themes/tospur/detail.php
	wp-content/themes/tospur/functions.php
	wp-content/themes/tospur/img/formBg.jpg
	wp-content/themes/tospur/img/logo.png
	wp-content/themes/tospur/js/gftools.js
	wp-content/themes/tospur/list.php
	wp-content/themes/tospur/loan_calculator.php
	wp-content/themes/tospur/map.php
	wp-content/themes/tospur/my.php
	wp-content/themes/tospur/view.php
	wp-content/themes/tospur/views/comment.html
	wp-content/themes/tospur/views/consultant_info.html
	wp-content/themes/tospur/views/consultant_list.html
	wp-content/themes/tospur/views/detail.html
	wp-content/themes/tospur/views/detailOther.html
	wp-content/themes/tospur/views/list.html
	wp-content/themes/tospur/views/loan_calculator.html
	wp-content/themes/tospur/views/map.html
	wp-content/themes/tospur/views/myHouse.html
	wp-content/themes/tospur/views/register.html
	wp-content/themes/tospur/views/view.html