Send user name with reset password instructions.
Create Newsletter scaffold.
merge update branch

Conflicts resolved:
	app/controllers/companies_controller.rb
	config/routes.rb
	db/schema.rb
merge update branch forgot schema