more fixes & improvements, but edit_from_template fails
Merge remote-tracking branch 'origin/hangouts-from-events' into hangouts-from-events

Conflicts:
	app/controllers/hangouts_controller.rb
more fixes & improvements,  edit_from_template succeeds, new "Events" index page