update settings.
Merge branch 'master' of https://github.com/hww712/haveku.com.git

Conflicts:
	haveku/haveku/settings.py