merge HemeraGestao/money