Conflicts:
	CHANGELOG.md

Targets defining custom values for the `ARCHS` build setting
require support libs to be built with at least those same settings
to be usable.

[init] Changes the check used to determine if a Podfile already exists.

[Search][POD::UserInterface] Use specification:derepecated? instead of the remove presenter:deprecated?

* 'master' of github.com:luisdelarosa/CocoaPods:
  Added 8 tests for issue #1489, one of which is failing. The failing test reproduces the issue that @jomnius reported with the < version operator. One of the passing tests checks the question that @alloy asked about using ~> with a pre-release version. The other passing tests verify correct behavior with the other version operators when dealing with pre-release versions.

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