20140130
Merge branch 'master' of https://github.com/shujianbu/newshub

Conflicts:
	website/website/__init__.pyc
	website/website/settings.pyc
	website/website/urls.pyc
	website/website/wsgi.pyc