Dev -> master

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