Merge branch 'master' of https://github.com/hjank/autorensystem

.idea/encodings.xml

index.html

js/authoring/controllers/authorSystemController.js

js/authoring/controllers/canvasController.js

js/authoring/controllers/contextInfoController.js

js/authoring/controllers/menuController.js

.../controllers/modalWindows/contactModalWindowController.js

...ers/modalWindows/deleteConnectionModalWindowController.js

...llers/modalWindows/deleteScenarioModalWindowController.js

...ntrollers/modalWindows/deleteUnitModalWindowController.js

...controllers/modalWindows/generalModalWindowsController.js

...ing/controllers/modalWindows/helpModalWindowController.js

...rollers/modalWindows/loadScenarioModalWindowController.js

...ng/controllers/modalWindows/loginModalWindowController.js

...trollers/modalWindows/newScenarioModalWindowController.js

.../controllers/modalWindows/profileModalWindowController.js

js/authoring/controllers/navBarController.js

js/authoring/controllers/saveScenarioController.js

js/authoring/controllers/sliderController.js

js/authoring/controllers/tabs/contextTabController.js