nothing
Merge branch 'master' of https://github.com/qreal/qreal-web

Conflicts:
	MobileCreator/MobileCreator/src/emulator/model/Emulator.js
	MobileCreator/MobileCreator/src/emulator/model/Page.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/ButtonTag.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/ControlPanelTag.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/ControlTag.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/ImageViewTag.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/InputTag.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/LinearLayoutTag.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/MapTag.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/TextViewTag.js
	MobileCreator/MobileCreator/src/emulator/model/attributes/WebViewTag.js
	MobileCreator/MobileCreator/src/emulator/model/logic/Logic.js
	MobileCreator/MobileCreator/src/emulator/model/logic/Trigger.js
	MobileCreator/MobileCreator/src/emulator/model/managers/EventManager.js
	MobileCreator/MobileCreator/src/emulator/model/managers/NavigationManager.js
	MobileCreator/MobileCreator/src/emulator/model/managers/XmlManager.js
	MobileCreator/MobileCreator/src/emulator/model/ui/Button.js
	MobileCreator/MobileCreator/src/emulator/model/ui/Control.js
	MobileCreator/MobileCreator/src/emulator/model/ui/ControlPanel.js
	MobileCreator/MobileCreator/src/emulator/model/ui/ImageView.js
	MobileCreator/MobileCreator/src/emulator/model/ui/Input.js
	MobileCreator/MobileCreator/src/emulator/model/ui/LinearLayout.js
	MobileCreator/MobileCreator/src/emulator/model/ui/Map.js
	MobileCreator/MobileCreator/src/emulator/model/ui/Map.js.map
	MobileCreator/MobileCreator/src/emulator/model/ui/TextView.js
	MobileCreator/MobileCreator/src/emulator/model/ui/WebView.js
	MobileCreator/MobileCreator/src/emulator/viewmodel/EmulatorViewModel.js
	MobileCreator/MobileCreator/src/utils/XmlHelper.js
	MobileCreator/MobileCreator/src/utils/log/Log.js
Show map with real data