QQ LA
Merge remote-tracking branch 'origin/master'

Conflicts:
	iDoNET/settings.pyc
	iDoNET/urls.pyc