好多新model
Merge remote-tracking branch 'origin/master'

Conflicts:
	accounts/__init__.pyc
	accounts/forms.pyc
	accounts/urls.pyc
	accounts/views.pyc
	iDoNET/__init__.pyc
	iDoNET/settings.pyc
	iDoNET/urls.pyc
	iDoNET/views.py
	iDoNET/views.pyc
	iDoNET/wsgi.pyc