Demand list and popup modal revised.
Merge branch 'master' of https://github.com/zhaoyan1117/PeakDemand

Conflicts:
	app/views/resource/_bottom_screen.html.erb
	app/views/resource/_calendar.js.erb