Revise index page.
Merge branch 'master' of https://github.com/zhaoyan1117/PeakDemand

Conflicts:
	app/models/user.rb