Merge branch 'mwithi_fix_worfklow_for_merges' of https://github.com/i…

…nformatici/openhospital-gui.git into mwithi_fix_worfklow_for_merges