Implemented: getCategories()
Added: generated NOT on getCategories()
Merge branch 'master' into bookingManager