setup for merge
Merge branch 'newlook'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/contracts_controller.rb
	app/models/contract.rb
	app/views/contracts/report.html.erb
	app/views/contracts/show.html.erb
	config/application.rb
	config/routes.rb
	db/schema.rb