merged with master
some improvements with Thomas, need to review the routes
Merge pull request #22 from maximevita/settling-bookings

Settling bookings