Cleanup
Report controller spec fix
Merge branch 'master' into GS-dev-reports

Conflicts:
	app/controllers/projects_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/models/user.rb
	app/models/user_project.rb
	app/views/tasks/index.html.slim
	db/schema.rb
Merge fix
Yet another merger fix