fixed #16
Merge branch 'sbt' of http://github.com/qreal/qreal into sbt
Id const &id (#16)
Id const &id (#267)
Interpreter. A choice between an interpretation and generative approach.
Interpreter. Partly working version.
Merge branch 'master' of https://github.com/qreal/qreal

Conflicts:
	plugins/hascol/hascolSupport/hascolParser.cpp
	plugins/metaEditor/metaEditorSupport/xmlParser.cpp
	qrgui/dialogs/dialogs.pri
	qrgui/dialogs/suggestToCreateDiagramDialog.cpp
	qrgui/dialogs/suggestToCreateDiagramDialog.h
	qrgui/mainwindow/mainWindow.cpp
	qrgui/mainwindow/mainWindow.h
	qrgui/mainwindow/mainWindow.ui
	qrgui/mainwindow/mainwindow.pri
	qrgui/mainwindow/paletteToolbox.cpp
	qrgui/mainwindow/paletteToolbox.h
	qrgui/models/logicalModelAssistApi.h
	qrgui/parsers/hascol/hascolParser.h
	qrgui/parsers/xml/treeElement.h
	qrgui/parsers/xml/xmlParser.h
	qrgui/pluginManager/editorManager.cpp
	qrgui/pluginManager/editorManager.h
	qrgui/qrgui_ru.qm
	qrgui/qrgui_ru.ts
	qrgui/umllib/edgeElement.cpp
	qrgui/view/editorViewScene.cpp
	qrgui/view/gestures/mouseMovementManager.cpp
	qrgui/view/gestures/mouseMovementManager.h
	qrrepo/repoControlInterface.h
Merge branch 'master' of https://github.com/qreal/qreal

Conflicts:
	qrgui/dialogs/startDialog/startDialog.cpp
	qrgui/dialogs/startDialog/startDialog.h
	qrgui/mainwindow/mainWindow.cpp
	qrgui/mainwindow/projectManager/projectManager.h
	qrgui/view/gestures/mouseMovementManager.cpp
	qrgui/view/gestures/mouseMovementManager.h
Button for Interpreter.
fix names of elements at palette
Interpreter.Icons.
Merge branch 'master' of https://github.com/qreal/qreal

Conflicts:
	qrgui/mainwindow/paletteTree.cpp
exterminatus
Merge branch 'sbt' of http://github.com/qreal/qreal into sbt
exterminatus
поправил баги с паданием (бесконечным вызовом функций)
added commentaries
rewritten commentaries
Merge branch 'master' of https://github.com/qreal/qreal

Conflicts:
	qrgui/dialogs/preferencesPages/miscellaniousPage.cpp
	qrgui/dialogs/preferencesPages/miscellaniousPage.ui
	qrgui/mainwindow/mainWindow.cpp
	qrgui/umllib/edgeElement.cpp
	qrgui/umllib/edgeElement.h
	qrgui/view/editorViewScene.cpp
Merge branch 'master' of https://github.com/qreal/qreal