Fixes to property adding.
Style fixes.
Merge branch 'master' of https://github.com/qreal/qreal into metamodelingOnFly

Conflicts:
	qrgui/dialogs/metamodelingOnFly/editPropertiesDialog.cpp
	qrgui/dialogs/metamodelingOnFly/editPropertiesDialog.h
	qrgui/dialogs/metamodelingOnFly/propertiesDialog.cpp
	qrgui/dialogs/metamodelingOnFly/restorePropertiesDialog.cpp
	qrgui/dialogs/metamodelingOnFly/restorePropertiesDialog.h
Restore removed elements.
Merge branch 'master' of https://github.com/qreal/qreal into metamodelingOnFly
Fixed Travis errors.
+ domainAnalysis + editor
+DA
Domain Analysis without generated files
Domain Analysis without generated plugin.qrc
editor.xml has updated
generator has updated
Style guide fixes.
Merge branch 'master' of https://github.com/qreal/qreal into metamodelingOnFly

Conflicts:
	qrgui/qrgui_ru.qm
	qrgui/qrgui_ru.ts
Fix to previous commit.
editor has replaced with domainanalysis editor (i.e. feature model editor)
editor has replaced
generator has updated
generator has updated
some strange things happen