fixed events form
updates to feed
update to member calendar feed
updates to events display
Merge branch 'staging'

Conflicts:
	app/controllers/events_controller.rb
	app/views/events/member_feed.ics.erb