Merge branch 'xcproject-based-pods' of github.com:pereckerdal/CocoaPods into fabio-pods-from-projects

* 'xcproject-based-pods' of github.com:pereckerdal/CocoaPods:
  Test that linked deps get compiled and linked properly
  Test that we do not add linked projects twice
  Add support for multiple Xcode subprojects per spec
  Add support for Xcode subprojects to podspecs
  Fix documentation typo
  Fix unit test

Conflicts:
	lib/cocoapods/installer.rb
	spec/unit/installer_spec.rb
	spec/unit/sources_manager_spec.rb

Also includes some small fixes here and there

* master: (294 commits)
  Bundle: update cocoapods-core
  Bundle: update Xcodeproj
  Validator: check license only in root spec
  Bundle: udpate cocoapods-core
  Integration: update for Xcodeproj
  Specs: fix for changes to Xcodeproj
  Update integration specs for Xcodeproj
  Gem: update Xcodeproj dependency
  Integration: update acknowledgements
  Bundle: make xcodeproj faster on mac
  Update integration specs for Xcodeproj
  Bundle:update
  CI: disable Ruby 1.8.7 for now
  Xcodeproj: udpate
  Bundle: update cocoapods-trunk version
  [Sandbox] Evaluate podspecs from their original path
  [Install/Update] Clarify command description. Relates to #2270.
  [README] Flatten badges
  [Gemspec] Update to nap 0.8
  Pod::Command::Spec::Lint::description update
  ...

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	spec/cocoapods-integration-specs

Required and update to the fixture spec repos

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

[Gemspec] Update to nap 0.8

[Sandbox] Evaluate podspecs from their original path