styleguide
Merge branch 'master' of https://github.com/IlyaSmirnov/qreal

Conflicts:
	qrgui/dialogs/preferencesDialog.cpp