styleguide
moar styleguide fixes
moar styleguide fixes
Merge branch 'robots-1.9.5' of https://github.com/qreal/qreal into robots-1.9.5

Conflicts:
	plugins/robots/robotsInterpreter/details/robotCommunication/usbRobotCommunicationThread.cpp
const
fixed Field
Merge pull request #482 from qreal/robots-1.9.5

Robots 1.9.5
styleguide
merged with qreal/master
Merge remote-tracking branch 'upstream/master' into up_master_nodeElement_refactoring

* upstream/master: (104 commits)
  moar styleguide fixes
  moar styleguide fixes
  styleguide
  some more styleguide fixes
  some small styleguide changes
  Corrected regulator example. omg, it works!
  1.9.5-RC3
  fixed build (git seems to be respecting case sensitivity compare settings even when merging)
  some visual corrections for 2d model window
  necessary changes
  abstractsimpleelementgeneration.h -> abstractSimpleElementGeneration.h
  This version worked. I believe.
  i don't know what's going on here some change doc and init/term block
  fixed some bugs GUI and fixed docs
  generation of sensors variables/AGAIN
  changes after pull
  fix sensor variables close watch window when qreal was closed
  added some files..
  fixed bug: open tab for generation code
  refactoring
  ...

Conflicts:
	qrgui/umllib/nodeElement.cpp
Merge branch 'master' of github.com:qreal/qreal into mergeVcs

Conflicts:
	qrgui/mainwindow/mainWindow.cpp
	qrgui/pluginManager/toolPluginManager.cpp
	qrgui/pluginManager/toolPluginManager.h
	qrkernel/settingsManager.cpp
	qrkernel/settingsManager.h
	qrutils/qrutils.pro
displayedName in property editor
made it compilable again
Merge pull request #548 from jzuken/master

Компилируемость
namespace fix; more tests for Id added
Merge remote-tracking branch 'qreal/master' into unittests
missed file added
Merge pull request #542 from vapolyakov/unittests

Unit tests
inheritance
styleguide