resolved db/schema conflict
Merge branch 'master' of github.com:StrataLabs/service_desk

Conflicts:
	db/schema.rb
added target tat and actual tat