Added initial model generator and started refactor on mixin
Added initial bookings controller
Merged latest upstream
Generator renaming for conventions
Generator renaming for conventions
Initial tests and refactorings