navbar for admin and user
Merge branch 'development' of github.com:bashantad/Industry-project into development
Conflicts resolved