Update categories for iOS 6

- Also make resetting the categories consistent in both locations

Fixes #290
#451 - Added CrashlyticsLumberjack to allow logs to be uploaded with a crash
#444 - Remove abort() from tapping Extra Debug row
Merge pull request #453 from wordpress-mobile/issues/444

#444 - Remove abort() from tapping Extra Debug row
Merge pull request #452 from wordpress-mobile/issue/451

#451 - Added CrashlyticsLumberjack to allow logs to be uploaded with crash
Adding translations for 3.8.4 release
Adding additional translations for 3.8.4 release
Merge branch 'release/3.8.4' into develop

Conflicts:
	Podfile
	Podfile.lock
	Pods/Manifest.lock
	Pods/Pods-AFNetworking-Private.xcconfig
	Pods/Pods-CTidy-Private.xcconfig
	Pods/Pods-CocoaLumberjack-Private.xcconfig
	Pods/Pods-DTCoreText-Private.xcconfig
	Pods/Pods-DTFoundation-Private.xcconfig
	Pods/Pods-JSONKit-Private.xcconfig
	Pods/Pods-MGImageUtilities-Private.xcconfig
	Pods/Pods-Mixpanel-Private.xcconfig
	Pods/Pods-NSLogger-CocoaLumberjack-connector-Private.xcconfig
	Pods/Pods-NSLogger-Private.xcconfig
	Pods/Pods-NSObject-SafeExpectations-Private.xcconfig
	Pods/Pods-NSURL+IDN-Private.xcconfig
	Pods/Pods-Quantcast-Measure-Private.xcconfig
	Pods/Pods-Reachability-Private.xcconfig
	Pods/Pods-SVProgressHUD-Private.xcconfig
	Pods/Pods-UIDeviceIdentifier-Private.xcconfig
	Pods/Pods-WordPressApi-Private.xcconfig
	Pods/Pods-WordPressTest-OHHTTPStubs-Private.xcconfig
	Pods/Pods-WordPressTest.xcconfig
	Pods/Pods-google-plus-ios-sdk-Private.xcconfig
	Pods/Pods-wpxmlrpc-Private.xcconfig
	Pods/Pods.xcconfig
	Pods/Pods.xcodeproj/project.pbxproj
	WordPress/Classes/WordPressAppDelegate.m
	WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress Internal.xcscheme
Updating version in develop to 3.9 & syncing Internal build plist
Merge branch 'develop' into feature/561-kill-all-warnings

Conflicts:
	Pods/Pods-AFNetworking-Private.xcconfig
	Pods/Pods-CTidy-Private.xcconfig
	Pods/Pods-CocoaLumberjack-Private.xcconfig
	Pods/Pods-DTCoreText-Private.xcconfig
	Pods/Pods-DTFoundation-Private.xcconfig
	Pods/Pods-EmailChecker-Private.xcconfig
	Pods/Pods-MGImageUtilities-Private.xcconfig
	Pods/Pods-Mixpanel-Private.xcconfig
	Pods/Pods-NSLogger-CocoaLumberjack-connector-Private.xcconfig
	Pods/Pods-NSLogger-Private.xcconfig
	Pods/Pods-NSObject-SafeExpectations-Private.xcconfig
	Pods/Pods-NSURL+IDN-Private.xcconfig
	Pods/Pods-Quantcast-Measure-Private.xcconfig
	Pods/Pods-Reachability-Private.xcconfig
	Pods/Pods-SVProgressHUD-Private.xcconfig
	Pods/Pods-UIDeviceIdentifier-Private.xcconfig
	Pods/Pods-WordPressApi-Private.xcconfig
	Pods/Pods-WordPressTest-OHHTTPStubs-Private.xcconfig
	Pods/Pods-WordPressTest.xcconfig
	Pods/Pods-google-plus-ios-sdk-Private.xcconfig
	Pods/Pods-wpxmlrpc-Private.xcconfig
	Pods/Pods.xcconfig
	Pods/Pods.xcodeproj/project.pbxproj