committing to complete merge
Merge branch 'feature_events'

Conflicts:
	app/controllers/static_pages_controller.rb
added ridiculous fix for home page featured events display
set default for new apprenticeships to "featured: false"
undid ridiculous change to home page featured events logic
Added default value of 'false' for :featured on events
Undo commented METRICS that killed the page
Merge branch 'master' into maker_payments

Conflicts:
	app/controllers/static_pages_controller.rb