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

Conflicts:
	accounts/forms.pyc
	accounts/urls.pyc
	accounts/views.pyc
	iDoNET/urls.pyc
	iDoNET/views.pyc
	iDoNET/wsgi.pyc
Merge branch 'master' of github.com:ck520702002/iDoNET

Conflicts:
	accounts/forms.pyc
	accounts/urls.pyc
	accounts/views.pyc
	iDoNET/urls.pyc
	iDoNET/views.pyc
	iDoNET/wsgi.pyc