Fixing typo created fixing conflicts
Fixing typo created fixing conflicts

teambox/teambox,vveliev/teambox,teambox/teambox,rahouldatta/teambox,nfredrik/teambox,nfredrik/teambox,vveliev/teambox,irfanah/teambox,vveliev/teambox,irfanah/teambox,vveliev/teambox,irfanah/teambox,irfanah/teambox,nfredrik/teambox,teambox/teambox,rahouldatta/teambox,nfredrik/teambox,rahouldatta/teambox