Merge pull request #7 from UlricGan/master

加入个人散点图[无交互]
合错pr的后果。。
先加一些页面元素
Merge remote-tracking branch 'origin/hackathon' into forhackathon

Conflicts:
	app/views/partials/person_performance.jade
	public/javascripts/controllers.js
按照设计图重新修改
个人业绩进度图实现基本功能
Merge remote-tracking branch 'origin/hackathon' into forhackathon

Conflicts:
	app/controllers/performance.js
	public/javascripts/controllers.js
	routes/base.js