BaseController.prepare fixes and User.models.User attribute changes

- [x] Updates BaseController.prepare for session check flow
- [x] Updates User model to make token a User attribute