Merge branch '#32665#Helpdesk#Column_title_alignment' into cmaster
Merge branch '#32761#Helpdesk#Remove_detach_button' into cmaster
Merge branch '#32794_Multiple_Sorting' into cmaster
#29799 - user added
Merge branch '#29799#Targetprocess_Company_dashboard' into cmaster

Conflicts:
	Hd.Web/App_GlobalResources/LanguageResources.fr-FR.resx
	Hd.Web/App_GlobalResources/LanguageResources.resx
	Hd.Web/Web.Config
Merge branch 'cmaster' of github.com:colours/Tp.HelpDesk into cmaster
#29799 - column added
Merge branch 'cmaster' of github.com:colours/Tp.HelpDesk into cmaster
testing just webpplication target
Merge branch 'test' into dev

Conflicts:
	Hd.Web/App_GlobalResources/LanguageResources.fr-FR.resx
	Hd.Web/Web.Config