Merge branch 'master' into develop

# Conflicts:
#	src/data/EditorData.ts
#	src/logic/actions/EditorActions.ts
#	src/logic/context/ContextManager.ts
#	src/logic/context/EditorContext.ts
#	src/logic/context/PopupContext.ts
#	src/logic/render/PointRenderEngine.ts
#	src/logic/render/PolygonRenderEngine.ts
#	src/logic/render/RectRenderEngine.ts
#	src/settings/_Settings.scss
#	src/store/general/actionCreators.ts
#	src/store/general/types.ts
#	src/store/selectors/GeneralSelector.ts
#	src/utils/EditorUtil.ts
#	src/utils/RenderEngineUtil.ts
#	src/views/EditorView/BottomNavigationBar/BottomNavigationBar.tsx
#	src/views/EditorView/Editor/Editor.tsx
#	src/views/EditorView/EditorContainer/EditorContainer.tsx
#	src/views/PopupView/ExitProjectPopup/ExitProjectPopup.tsx
#	src/views/PopupView/ExportLabelsPopup/ExportLabelPopup.tsx
#	src/views/PopupView/LoadLabelNamesPopup/LoadLabelNamesPopup.tsx
#	src/views/PopupView/LoadMoreImagesPopup/LoadMoreImagesPopup.tsx

README.md

@@ -95,6 +95,17 @@ Feel free to file [issues](https://github.com/SkalskiP/make-sense/issues) or [pu
 }
 ```
 
+## Citation
+
+```
+@MISC{make-sense,
+   author = {Piotr Skalski},
+   title = {{Make Sense}},
+   howpublished = "\url{https://github.com/SkalskiP/make-sense/}",
+   year = {2019},
+}
+```
+
 ## License
 
 This project is licensed under the GPL-3.0 License - see the [LICENSE][2] file for details

src/model/EditorModel.ts

@@ -0,0 +1,17 @@
+import {PrimaryEditorRenderEngine} from "../logic/render/PrimaryEditorRenderEngine";
+import {BaseRenderEngine} from "../logic/render/BaseRenderEngine";
+import {IRect} from "../interfaces/IRect";
+import {IPoint} from "../interfaces/IPoint";
+
+export class EditorModel {
+    public static canvas: HTMLCanvasElement;
+    public static mousePositionIndicator: HTMLDivElement;
+    public static cursor: HTMLDivElement;
+    public static primaryRenderingEngine: PrimaryEditorRenderEngine;
+    public static supportRenderingEngine: BaseRenderEngine;
+    public static image: HTMLImageElement;
+    public static imageRectOnCanvas: IRect;
+    public static imageScale: number; // Image / Canvas
+    public static mousePositionOnCanvas: IPoint;
+    public static isLoading: boolean = false;
+}