Merge branch 'master' into LMW-49-beta-6

Conflicts:
	ios/Library/Liferay-iOS-Widgets.xcodeproj/project.pbxproj
	ios/Library/Source/Base/BaseWidgetView.swift
	ios/Library/Source/DDLForm/DDLFormTableView.swift
	ios/Samples/Swift/Liferay-iOS-Widgets-Swift-Sample.xcodeproj/project.pbxproj