container inheritance fix
Merge branch 'containersFix' of git://github.com/vapolyakov/qreal

Conflicts:
	qrgui/pluginManager/editorManager.cpp
	qrgui/pluginManager/editorManager.h
Merge branch 'master' of https://github.com/qreal/qreal
insert into edge command
Merge pull request #870 from Ashatta/insert_into_edge

Вставка элемента внутрь линка
Merge pull request #855 from qreal/containerInheritance

Container inheritance
Merge branch 'master' of https://github.com/qreal/qreal