DF-3435 moved fonts to separate yaml file, moved fonts map to font manager
Merge branch 'development' into fonts
Merge branch 'development' into fonts
DF-3435 fixed loading default fonts
Merge branch 'development' into fonts
Merge branch 'development' into fonts
Merge branch 'development' into fonts
Merge branch 'development' into fonts
Merge branch 'development' into fonts
Merge branch 'development' into fonts
Merge branch 'development' into fonts
Merge branch 'development' into fonts
[DF-3714], [DF-3715] - UIWebView & UIMovieView are added to UIEditor.
UIJoypad icon.
Merge branch 'development' into fonts
Merge branch 'development' into fonts
[DF-3713] - Joypad control is integrated to UIEditor.
[DF-3713], [DF-3714], [DF-3715] - Win32 changes.
Merge branch 'origin/development'

Conflicts:
	Tools/UIEditor/UIEditor.xcodeproj/project.pbxproj
Merge branch 'origin/development'

Conflicts:
	Tools/UIEditor/UIEditor.vcxproj.filters