Refactored login, inheritance model users, bokking + trip entities
Merge remote-tracking branch 'origin/master'