把 performance.js 空出来
Merge remote-tracking branch 'origin/hackathon' into forhackathon

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