update
Merge branch 'master' of https://github.com/junyangchen/bixplorer

Conflicts:
	bixplorer/urls.pyc