Merge remote-tracking branch 'origin/develop' into feature/client_typescript_port1

; Conflicts:
;	package-lock.json

src/public/app/widgets/buttons/calendar.js

@@ -222,7 +222,6 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
     }
 
     async createMonth() {
-        console.log(new Error());
         const month = utils.formatDateISO(this.date).substr(0, 7);
         const dateNotesForMonth = await server.get(`special-notes/notes-for-month/${month}`);
 

src/public/app/widgets/tab_row.js

@@ -176,7 +176,7 @@ const TAB_ROW_TPL = `
         bottom: 0;
         right: 0;
         left: 0;
-        z-index: 1000;
+        z-index: 50;
     }
     
     .tab-row-widget .note-tab .note-tab-close {

src/public/app/widgets/type_widgets/options/options_widget.js

@@ -61,7 +61,9 @@ export default class OptionsWidget extends NoteContextAwareWidget {
     async refreshWithNote(note) {
         const options = await server.get('options');
 
-        this.optionsLoaded(options);
+        if (options) {
+            this.optionsLoaded(options);
+        }
     }
 
     async entitiesReloadedEvent({loadResults}) {