fixed a bug
Supported attribute "override" for ports.
Small remarks in supported "override"
Supported attribute "override" for ports.
merge branches and removal conflicts
merge branches [2]
supported generalizations for "pictures" and "labels"
Merge branch 'master' into override
some modifications for "label"
multiple inheritance and changes in styleguide
repair "}"
small changes
small changes for "Override"
changes for "override"
with consts
Merge branch 'master' of https://github.com/qreal/qreal into override

Conflicts:
	qrxc/edgeType.cpp
Merge pull request #1288 from Julia-Khramyshkina/override

Override
Merge pull request #1271 from artbez/master

Edited selection of the label by pressing F2
Updated generation templates to support new videosensors
Fixed graphical inheritance in qrxc