added bs-navbar to sidebar
merged sidebar
updated profile and users
updated users
updated tests
updated tests