In progress.
Merge branch 'master' of https://github.com/zhaoyan1117/PeakDemand

Conflicts:
	app/views/resource/show.html.erb