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
offed extra plugins
#850 fixed.
Added mouse gestures
reverted plugins
Fixed path
Merge pull request #868 from AirVan21/master

Mouse Gestures Added
* Merge branch '#476' of https://github.com/qreal/qreal

Conflicts:
	qrgui/dialogs/preferencesPages/miscellaniousPage.cpp
	qrgui/dialogs/preferencesPages/miscellaniousPage.ui
Merge pull request #863 from qreal/#850

#850 fixed.
insert into edge command
Merge pull request #870 from Ashatta/insert_into_edge

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

Container inheritance
fixed #865
Merge pull request #873 from qreal/865

fixed #865
styleguide fixes
changed SquareLine and CurveLine config variables to single LineType
Merge branch 'master' of https://github.com/qreal/qreal into feature

Conflicts:
	qrgui/dialogs/preferencesPages/miscellaniousPage.cpp
	qrgui/qrgui_ru.qm
	qrgui/qrgui_ru.ts
fixed translations