商家注册更新
Merge branch 'master' of https://github.com/tcmaster/HiSite

Conflicts:
	HiSite/res/layout/activity_forgotid_main.xml
	HiSite/src/com/android/hisite/activity/ForgetIDActivity.java