Removed the custom CORS implementation in favour of a Web Filter that provides a more complete implementation with more options.
Merge branch 'ha-devel' of github.com:pressgang-ccms/PressGangCCMSREST into ha-devel
Fixed a merge issue.