Edit resource form functional.
Merge branch 'master' of https://github.com/zhaoyan1117/PeakDemand

Conflicts:
	app/views/resource/_email_provider.js.erb
	app/views/resource/_show_demand.js.erb
	app/views/resource/_top_screen.html.erb