fix
fix
Merge branch 'master' of https://github.com/tuhao/WIFIWeixin
fix

Conflicts:
	merchant/models.py