Add .DS_Store and filters to .gitignore
Merge remote-tracking branch 'origin/develop' into develop
Started moving AdminNotifications to common area
Merge to single repository (develop)

Merge from shinetechs/features/99-XSS-Prevention to new branch
"features/99-XSS-Prevention" (develop)
Merge to single repository (develop)

Merge from shinetechs/features/100-Upgrade-Jquery to new branch
"features/100-Upgrade-Jquery" (develop)
Merge to single repository (develop)

Merge from shinetechs/features/105-NoCache-Headers to new branch
"features/105-NoCache-Headers"
Merge to single repository (develop)

Merge from shinetechs/features/98-Unit-Permissions to new branch
"/features/98-Unit-Permissions" (develop)
updated import to reflect moved code
move smtp config into the radar properties sub module
Merge pull request #28 from richardli5945/features/100-Upgrade-Jquery

Features/100 upgrade jquery
Merge pull request #29 from richardli5945/features/105-NoCache-Headers

Features/105 no cache headers
Fixed the comment

Deleted the comment.
Reverted changes regarding moving Admin Notifications to common area
Added the Esapi code into the XSSUtils.

Added the Esapi code into the XSSUtils, removed the
ESAPI.encoder().encodeForHTML call in models.
Merge pull request #27 from richardli5945/features/99-XSS-Prevention

Features/99 xss prevention
Merge remote-tracking branch 'origin/develop' into develop
Fiex the 98-Unit-Permissions

Removed the authorisation in feedback functionality and added the test
for successful access for valid users.
Merge pull request #30 from richardli5945/features/98-Unit-Permissions

Features/98 unit permissions
testGetSpecialGroupUsers requires a logged in user now
fix test, and remove old file that came in with the merge