Merge branch 'master' of https://github.com/HuberyDu/bancheng
Merge branch 'master' of https://github.com/HuberyDu/bancheng
修改deploy文件
fixed untracked files
Merge branch 'master' of https://github.com/HuberyDu/bancheng
调整css加载方案，以通过production环境下的预编译
Careers前端页面数据嵌入
其他微调
Merge branch 'master' of https://github.com/HuberyDu/bancheng
Merge branch 'master' of https://github.com/HuberyDu/bancheng

Conflicts:
	app/assets/javascripts/faq.js
	app/controllers/leave_messages_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/site_controller.rb
	app/views/site/faq.html.haml
	config/deploy.rb