Merge branch 'master', remote-tracking branch 'origin'
Individual Calendar is in pending
conflict at usermenu
calendar1 syntax issue
submenu for librarian library