updating calculator
adding "combination generation" to hotel
updating combination generation
bug fix: calculator price
improving calculator and generation
Merge branch '2-4-stable'