random testing
Merge branch 'master' into implement_scheduled_events

Conflicts:
	app/controllers/static_pages_controller.rb