SOS-1653 Fix XSS issue
SOS-1653 S/F
SOS-1653 SF
SOS-1659 Fixing misaligned button in Announcements portlet
SOS-1660 Changing Markup for add-contact button
SOS-1660 S/F adding namespace
SOS-1660 S/F
SOS-1660 S/F