Merge branch 'master' of git@github.com:ehotel/ehotel.git
Merge branch 'master' of https://github.com/ehotel/ehotel.git