change name"zhaopin" to name"jobs"
Merge remote branch 'upstream/master'
导航栏问题
招聘信息页面
修改部分细节
Merge pull request #5 from hexiaoming/master

将zhaopin改为jobs
product review for 招聘信息页面
Merge remote branch 'upstream/master'
将提示信息改成中文。
将实习括号改为中文
Merge pull request #50 from hexiaoming/master

product review for 招聘信息界面
更改了log设置文件的位置
Merge remote branch 'upstream/master'
更改log配置
Merge pull request #53 from hexiaoming/master

更改了log设置文件的位置
polish
enable debug
Merge remote branch 'hello/master'

Conflicts:
	Gulpfile.js
	assets/css/jobs.css
	assets/css/talk.css
	assets/js/jobs.js
	assets/js/login.js
	assets/js/talk.js
	backend/models.py
	baidu/settings.py
	base/decorators.py
	base/js/login.js
	base/views.py
	templates/login.html