Fixing missed conflicts in task_status feature
Fixing missed conflicts in task_status feature

teambox/teambox,nfredrik/teambox,vveliev/teambox,vveliev/teambox,irfanah/teambox,rahouldatta/teambox,irfanah/teambox,irfanah/teambox,nfredrik/teambox,codeforeurope/samenspel,ccarruitero/teambox,crewmate/crewmate,ccarruitero/teambox,irfanah/teambox,crewmate/crewmate,vveliev/teambox,rahouldatta/teambox,nfredrik/teambox,vveliev/teambox,rahouldatta/teambox,nfredrik/teambox,teambox/teambox,codeforeurope/samenspel,teambox/teambox,crewmate/crewmate