zsj_add Merchant_lonin_sinup_function
zsj_merchant_signin_signup
zsj_add_house_add_function need to repair
zsj_add_HousesManage_function
zsj_add_function_merlogout
repair the function and add urls for merchant_account,ordermanage,housemanage,account,confirm
zsj_add_changepassword_function
zsj_add_AccountManage_function
zsj_need_to_repair
zsj_add_AccountMoney_function
zsj_add_merchant_message_model_function
zsj_add_alipay_function_need_to_repair
zsj_add_function_uploadpicture_need_to_repair
zsj_add_function_VipConfirm
zsj_add_MerchantConfirm_function
zsj_add_sendmessage_function
zsj_message_need to repair
Merge remote-tracking branch 'zsj/master'

Conflicts:
	portal/models.py
	portal/views/account.py