wip
Merge branch 'UIControlPrototypes_v01' of https://github.com/dava/dava.framework into UIControlPrototypes_v01

Conflicts:
	Tools/UIEditor/Classes/UI/mainwindow.cpp
	Tools/UIEditor/Classes/UI/mainwindow.h
	Tools/UIEditor/UIEditor.xcodeproj/project.pbxproj
wip