fixed conflicts
Merge branch 'master' of github.com:ck520702002/iDoNET

Conflicts:
	product/models.py