There were conflict in the merge, created a patch and a applied it to a new branch.

Display pods which are deprecated in a red tone when searching

[Search][POD::UserInterface] Display pods which are deprecated in a grayed out color with the pod it was deprecated in favor of if there is such a pod

Fixes an issue where XCTest is missing in Xcode 6

Required and update to the fixture spec repos

The XCTest.framework bundle has changed location in Xcode 6. This PR
fixes this [#2296](https://github.com/CocoaPods/CocoaPods/issues/2296)

Conflicts:
	CHANGELOG.md

Closes https://github.com/CocoaPods/Core/issues/132

[Gemspec] Update to nap 0.8

[Sandbox] Evaluate podspecs from their original path

Re https://github.com/CocoaPods/pod-template/issues/50

fix pod repo push to first check if Specs Dir exists

Merge branch 'CLAide-Argument' : Migrating to new CLAide::Arguments syntax (see CocoaPods/CLAide#33)

Closes #2136