Merge branch 'master' into pods-project-edit-feature

* master:
  [Installer] Improve project sorting

Conflicts:
	Gemfile.lock
	lib/cocoapods/installer.rb
	spec/cocoapods-integration-specs

Gemfile.lock

@@ -17,7 +17,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: 74b499909e586ad8b1a0647c77b8dd7e1156acee
+  revision: 84782b972ef24e7565eaf9ab96a0bb1cb4c0521f
   branch: master
   specs:
     xcodeproj (0.10.1)

lib/cocoapods/project.rb

@@ -54,7 +54,7 @@ module Pod
     def prepare_for_serialization
       pods.remove_from_project if pods.empty?
       development_pods.remove_from_project if development_pods.empty?
-      main_group.recursively_sort_by_type
+      sort
     end
 
 

cocoapods-integration-specs @ 9380cad5

-Subproject commit 8c69bdc7bf5c93a8a2e0c05cce2a3c2e1d80de6b
+Subproject commit 9380cad5615ba0ba6c3544ef9aedf1524554dc55