Merge remote-tracking branch 'DAVA/development' into feature-new-materials
[Df-564] ui part, infrastructure for win
[DF-564] win part completed
[DF-564] xcode proj
[DF-651] manually merged diff from old pull request
Merge branch 'DF-564_SetSwitchIndex' of https://github.com/adebt/dava.framework into merge-switchviewer

Conflicts:
	Tools/ResourceEditor/Classes/Qt/Main/QtMainWindowHandler.cpp
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters
[DF-564] Fix: compilation error