SDPIII-8
SDPIII-8
merged conflicting file
changing alert labels in ticket.js
Merge branch 'master' into SDPIII-8-2
merging template changes with master SDPIII-8