SDPIII-8
SDPIII-8
merged conflicting file
changing alert labels in ticket.js
Assigned to my unit changes
Tickets reported by me-- dashboard changes
dsb assigned tickets --dashboard changes
reported by me -- dashboard changes
reported by my unit --dashboard changes
empty row added in tables
Merge branch 'master' into SDPIII-8-2
merging template changes with master SDPIII-8
fixes to create reports for department and branch
Specs fixed according to new dashboard changes
link bug resolved for cancel and closed tickets
valid template changes
fixed the event name for resolve ticket
Fixed failing specs
Merge branch 'master' of github.com:StrataLabs/service_desk into dashboard_changes

Conflicts:
	app/helpers/tickets_helper.rb
Dashboard changes -- specs modified for normal/priority changes
SDPIII-75 removed column classification from tickets