Change cinema and user model to reflect their relation
Change navbar to be more consistent with mockups
Commit to appease K.K. wishes
Resolve merge conflicts