lh
Merge branch 'master' of https://github.com/li1993hao/xiandai

Conflicts:
	.idea/workspace.xml

app/data/cp_tpl/802d6d761f8cb01aaabcb4714083f24fd5ec09a5.file.modifycomi
nfo.htm.php

app/data/cp_tpl/9f0748a986cc581b765659e104c311774856b677.file.detail.htm
.php

app/data/cp_tpl/fe0f70dfbcc919341cfdf4cc22d53ede3e7fca5a.file.header.htm
.php
	app/tpl/company/modifycominfo.htm
	app/tpl/employmentteam/index.htm
	app/tpl/professionpersontalk/talkdetail.htm
	app/tpl/sourceinformation/detail.htm
	app/tpl/west/detail.htm
	common/app/css/headAndfoot.css
	common/app/js/header.js
Revert f090a0c..b43764e

This rolls back to commit f090a0c6e93d148751544252b7eecdfe85d751df.
lh
Revert bd5482a..fea2c6d

This rolls back to commit bd5482a30e0371c670523e99be4b89689c3b67be.