Moved sorting of reservation types into the module
Added support for getting only one type of reservations
Merge branch 'release' into development