HPTPORTAL-704
Merge branch 'master' of github.com:nnotario/hospiten_omega