* 'master' of https://github.com/andreamazz/CocoaPods:
  Removed useless comment
  Added spec and updated CHANGELOG
  Trimmed line length
  Fixed indentation
  Pod update displays the previous version of a pod

Conflicts:
	CHANGELOG.md

Fixes problem in CocoaPods/Specs#10341

Feature allow homepage redirects

Conflicts:
	lib/cocoapods/validator.rb

Related to https://github.com/CocoaPods/CocoaPods/issues/2028

* samuelwford-issue-1042-keep-local-paths-abs:
  clean up naming a little bit absolute path tracking
  preserve local pod paths specified as absolute or rooted to home
  return Pathname instead of string, remove obsolete comment
  working spec for abs root
  remove "was_absolute" tracking and simplify local pod handling to always use absolute paths
  try to get test wrapped around absolute path
  fix #1042 - keep absolute paths for local pods as is

Merge branch 'issue-1042-keep-local-paths-abs' of https://github.com/samuelwford/CocoaPods into samuelwford-issue-1042-keep-local-paths-abs

* 'issue-1042-keep-local-paths-abs' of https://github.com/samuelwford/CocoaPods:
  clean up naming a little bit absolute path tracking
  preserve local pod paths specified as absolute or rooted to home
  return Pathname instead of string, remove obsolete comment
  working spec for abs root
  remove "was_absolute" tracking and simplify local pod handling to always use absolute paths
  try to get test wrapped around absolute path
  fix #1042 - keep absolute paths for local pods as is

Conflicts:
	CHANGELOG.md

Closes #1815

@orta & @neonichu would be proud!

Merge branch 'issue_1449_duplicate_prefix_header_contents' of https://github.com/luisdelarosa/CocoaPods into luisdelarosa-issue_1449_duplicate_prefix_header_contents

* 'issue_1449_duplicate_prefix_header_contents' of https://github.com/luisdelarosa/CocoaPods:
  Addressed comments from @irrationalfab: - simplified collection of unique prefix_header_contents - reduced sub specs in spec from 4 to 2 Removed inline documentation and added @notes and @todos. Added entry to Changelog.
  Fix issue #1449 by collecting the prefix_header_contents and uniq-ing them.
  Add integration test for issue #1449.
  Added two tests for issue #1449 - however both are passing at the unit level so I suspect that the issue will need to be tested at the integration test level.

Conflicts:
	CHANGELOG.md

[linter] Validate screenshots are valid

Closes #2010

Fix is a bug with nap and has been fixed in nap.

https://github.com/Fingertips/nap/pull/4
Fixes #1998

Added more detailed output to lib create

Use configure file