Conflicts:
	js/authoring/controllers/unitController.js

! fixed dead unit dragstop event handler, moving code into inst.draggable(...)
+ added lightboxUnit() to unitController

+ added connectsUnit() to connectionModel, which checks if the connection leads to/from the given unit
+ added removal of attached connections to removeUnit() in scenarioModel: connections leading to/from a deleted unit will be deleted from model, too
# removeConnection() in scenarioModel now accepts only the ID of a connection as parameter (instead of the entire connection)
- removed deleteUnitFromModel() from unitModel
+ added removeUnitFromScenario() to unitController, comprising all necessary function calls for removing a unit from view and model
# merged similar but distributed unit deletion functionality from tab and modal window into removeUnitFromScenario() call; now all use the same functionality
+ added check for existence of a unit model to its click event handler: prevents errors when units are added and clicked but not named yet
+ added check for scenario name availability to newScenarioModal....: alert if entered name for new scenario is already taken
! fixed (really stupid, really) unit deletion bug (i.e. not happening): added "#" to delete unit button $-selectors
+ added TODO to loadScenario() in authorSystemController: the whole thing is stale and just won't work

# moved setLabelBtnScenarioDeletion() into deleteScenarioModalWindoeController where it belongs

TODO: find out why chosen parameter values won't get reloaded on editing

+ added global variable unitContextIndex (index of the current info in the unit's context array) to contextTabController to be able to distinguish between add and edit mode
# replaced contextDataCounter and contextDataIndex with this variable
# replaced id in array_multiSelectionContextInfos with this index
# distinguished adding of icons to unit: when editing context, the icon gets replaced, otherwise a new one is added
TODO: select2 doesn't seem to work correctly anymore on new array_mutli...

# adjusted getParameterInput() to changes in DOM

# in contextTabController: compactified DOM element attribute assignments
# replaced almost all "===" with "=="
+ added Boolean context values as enums in xmlParser (to access them later in contextInfoController)

# in locationInfoMapViewController: some minor changes to make map work again

+ in contextTabController: added fillOperatorSelection() --> consistent with fillInputField() and fillOperatorSelection()
# in contextTabController: corrected test: operator == "NO_VALUE"
# in contextTabController: adjusted test if multiple context infos > 2 then show "all or one" selection
# in contextTabController: made formatMultiContextInfosElements() process one item, not all
# in contextTabController: for each fill.*() function check for chosen value/operator (i.e. if this is in edit mode) and render fields/selections accordingly
- in contextInfoController: removed test for "Error999" (i.e. context info added more than once)
# started overhauling locationInfoMapViewController --> TODO: check if it works in edit mode

+ added chosenOperator in contextInfoModel

! in checkInformation(): extended "else" scope from "if selectedInfoID == null" till the end of all checking
# missing content error is now handled in checkInformation() which from now on returns only the selectedInfo

# moved event handlers for connections from canvasController to relationTabController
# moved initUnitEventHandlers() from canvasController to unitController
# moved chooseMetaIcon() from unitController to formatSelections
+ added optional index parameter to addContextInfo() in unitModel
+ added getItemByID() to contextInfoListModel
# started correcting German umlauts in dictionaries
# changed data structure of array_multiSelectionContextInfos:
   1. "id" is now context ID, "text" its translation;
   2. new items now get pushed to the end of the array, changed items stay where they are
# changed changeColorMultiContextInfos() into formatMultiContextInfosElements()
TODO: editing items in multi selection does not work as it should (see latter changes)

! fixed bug in AuthorSystemContent model's getUnitByUUID()
+ added context info removal function to Unit model
# in formatSelections: made formatUnitIcons() more compact, self-contained and generically usable
# simplified loadUnit() in unitController, applying new functions formatUnitIcons() and addMetaDataToUnit()
- removed activateFunctionalities() and activateContextConfirmation()
# moved contextTab-specific event handlers from generalTabController to contextTabController
# replaced returnArray from checkInformation() with object
# replaced value of "id" in array_multiSelectionContextInfos (multiple infos of same type possible)
TODO: multiContextSelection still troublesome with new kind of IDs, needs to be revised!
TODO: compactify "all" or "one" design rendering code

+ added function to get unit from entire author system content by its UUID
- in contextInfoModel: removed unnecessary complexity in value object
+ in contextInfoModel: added each part of former value object as context info property + getter and setter functions for each
# completed changes towards consistent usage of models: contextInfo, parameters, unit, authorSystem
# completed changes in checkInformation(), drawing information from model structure instead of view
# renamed parameter input and select fields and divs with generic ID "parameter"+i and "divParameter"+i, resp.
# untangled event handlers for clicked or dragged units and properties tab from "blob" activateFunctionalities()
# replaced (use and function of) global var global_currentInputUnitName with global var currentUnitUUID
# made variable currentConnectionID global

# replaced unit DOM element IDs "stateX" with UUIDs
# further merged, simplified, and corrected code (matching new data models)

- removed metadataTabController script tag from html
# overall replacement of myAuthorSystem with instance of AuthorSystemContent model

Conflicts:
	index.html
	js/authoring/controllers/tabs/contextTabController.js

# renamed divContextParameters (+ temporary changes in index.hmtl, will be overridden soon)
- removed metaData tab which was a mere placeholder for Tom's CMS work
+ added metaData dictionary
+ added functions addMetaDataToUnit() and removeMetaDataFromUnit()
# changed parameter access and collection in contextInfoController and locationInfoMapController
# moved "get current unit dictionary" code into function getCurrentUnitDataModel()

# simplified event handlers for new scenario modal window input

# re-added "template" divParameterSelection in index.html to test select2 plugin (flat ui) on clone
# TODO: fix async select2 rendering (not working with dynamically generated DOM elements)

# minor changes before *the great parameter refactoring* i.e. generification, type checking, value checking, ... (to do)

Conflicts:
	js/authoring/controllers/canvasController.js

# event handler and functions for modal windows are separated in different files located in /js/mvc/controller/modalWindows