Merge branch 'yearly_plans' into development

Conflicts:
	app/models/employer.rb
	app/models/plan_year.rb
	app/views/employers/showtabs/_elected_plans.html.erb
	db/seedfiles/employers.rb