Fixed more merge conflicts found in the Navigation and Edit modules, created new University branch for university changes