Dev -> master

Pull changes from ```dev``` into ```master``` branch from last several months.  Will need to change necessary bundle keys (for Google OAuth) back after merge, particularly in app's ```.plist``` and ```.xccheckout``` files.