馬的都好了
Merge remote-tracking branch 'origin/master'

Conflicts:
	accounts/__init__.pyc
	iDoNET/__init__.pyc
	iDoNET/settings.pyc
	product/models.py