Remove extraneous comment on tests
Refactor controllers to use cancan to load spaces and restrict access to disabled ones
Copy paste field, with modal using only javascript

Using the new helper function copyable_field
Ability for admins to delete spaces

Now the spaces controller supports destroy (to actually delete) and disable (to disable like the old destroy action did)

Actions are authorized by cancan and new tests have been added. The admins of a space can disable it, but only an admin can destroy
Space count in managing wasn't counting disabled spaces
Merge remote-tracking branch 'origin/branch-v2-copy-paste' into branch-v2

Conflicts:
	app/views/spaces/_latest_users.html.haml
A few improvements and cleanup in the copy-to-clipboard modal

All small changes, mostly to make it look a bit nicer.
Merge remote-tracking branch 'origin/branch-v2-delete-stuff' into branch-v2
Overall improvements on disabling and removing spaces

Better icons for disable/enable, clearer messages and confirmations when a
user is disabling/enabling a space, and a general code review.

After merging branch-v2-delete-stuff

refs #1153
Better default page shown when a user logs out of a conference

The page was still in the old format.
Refactored it, converting to HAML and making it look good.
Now it also has a timer to automatically close the window unless the user
asks it not to.
Redirect correctly to previous page on login

refs #1231
Update mweb_events to latest version
Fix setting the record flag in webconfs, broken by c66a9a41ab

Wasn't considering the Site's flag "webconf_auto_record" as it should.
Fix style for mweb_events-events/create

Was using the stylesheet for #new only, not for #create.
Correct error on event creation
Using Time.zone when code uses time zones (events)
Better calendar and timepicker for events
Merge remote-tracking branch 'upstream/branch-v2' into branch-v2

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb
	spec/models/space_spec.rb