提交当前版本
Merge remote branch 'upstream/product'

Conflicts:
	.gitignore
Merge remote branch 'upstream/master'

Conflicts:
	backend/jobs_views.py
	backend/models.py
更改requirement.txt
Merge pull request #55 from hexiaoming/master

提交当前版本