更新user model
更新git.ignore
Merge branch 'master' of github.com:ck520702002/iDoNET

Conflicts:
	accounts/forms.pyc
	iDoNET/settings.py
	iDoNET/settings.pyc