Conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/concerns/time_trackable.rb
	db/schema.rb