update
Merge branch 'master' of github.com:cheyo/ShenZhenHouse

Conflicts:
	Django-szhouse/szhouse/urls.pyc