Unknown changes
Merge branch 'master' of https://github.com/IlyaSmirnov/qreal
Add some changess to server
Merge branch 'master' of https://github.com/IlyaSmirnov/qreal

Conflicts:
	qrgui/configurationNetworkManager/client.cpp
	qrgui/dialogs/preferencesPages/paletteEditorPage.cpp