merge
merge
Merge branch 'master' of https://github.com/Dashlane/Dashlane-iOS-Extension

Conflicts:
	Example App/Travel+Style.xcodeproj/project.xcworkspace/xcuserdata/samir.xcuserdatad/UserInterfaceState.xcuserstate