* master:
  Further rationalize the Pods porject
  [Integration] Sort projects

Conflicts:
	lib/cocoapods/installer/pods_project_generator/target_installer/pod_target_installer.rb
	lib/cocoapods/installer/target_installer.rb
	lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
	lib/cocoapods/project.rb
	spec/unit/installer/file_references_installer_spec.rb
	spec/unit/installer/pods_project_generator/target_installer/pod_target_installer_spec.rb
	spec/unit/installer_spec.rb
	spec/unit/project_spec.rb