Removed join_from, etc... from events_controller
Remove join_from from factories.rb
Made it so the join/leave buttons don't show up for the owner
Add mercury gem
Changed application.js and application.css to not require_tree since the mercury files are big
Installed mercury
Change the save url for mercury
Add page to event
Add mercury_update functionality to the event page, and make the event page look better
Some authentication for mercury_update
Removed old fields (join_from, etc...) from event_spec. Added page
Merge branch 'wysiwyg'

Conflicts:
	app/controllers/events_controller.rb
	app/views/events/show.html.erb
	config/routes.rb
	db/schema.rb