Explicitly synchronize configuration updates and warn if it fails.
Remove USM from Mac app.
Don't crash if attempting to import with an invalid password type.
Move Info.plist update script into Scripts to share it between Mac and iOS.
Put Mac icon into AppIconSet
Build fixes and layout improvements for Mac on Yosemite.
Merge remote-tracking branch 'upstream/master' into Build-patch