项目初始化
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/server/controllers/employee.js
	app/server/models/employee.js
	config/env/production.js
	config/routes.js
	server.js