like
like
Merge branch 'master' of https://github.com/fay/lianpeng

Conflicts:
	lianpeng/settings.py
	lianpeng/urls.py