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

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