Template review fixes
Template review fixes
Merge branch 'develop' of https://github.com/basekit-templates/hotelkoya into develop