[DF-589] Fix: merge with development
Merge branch 'development' into merge-webview

Conflicts:
	Projects/UnitTests/TemplateProjectiPhone.xcodeproj/project.pbxproj
	Projects/Win32Framework/Win32Framework.vcxproj.filters
[DF-589] Fix: merge with development
[DF-589] Fix: compilation errors on iOS
Merge branch 'merge-webview' into development