repair of list view
main-navbar correction
restricted user's controller
Merge remote-tracking branch 'upstream/master'
merged pullRequest#2