Merge branch 'master' into event_api

Conflicts:
	app/controllers/api/v1/cursor_events_controller.rb
	app/controllers/api/v1/grading_events_controller.rb
	app/controllers/api/v1/input_events_controller.rb
	app/controllers/api/v1/message_events_controller.rb
	app/controllers/api/v1/tasking_events_controller.rb
	lib/active.rb
	lib/activity.rb
	lib/app.rb
	lib/event.rb
	lib/eventful.rb
	lib/user.rb
	spec/lib/event_spec.rb
	spec/models/message_event_spec.rb
	spec/models/task_event_spec.rb