DeptCol
conflict fix
Merge files
Merge conflict
Changes to schema.rb
Removed git merge
Everything works with db unified models
Fully working MySQL
Fixed conflicts
Fix TaskModel
Fixed conflicts