Merge remote-tracking branch 'DAVA/development-qa' into development_browser_plugin

Conflicts:
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj