Fixed merging issues
Merge branch 'ha-devel' of github.com:pressgang-ccms/PressGangCCMSREST into ha-devel