fix($urlRouter): revert BC: resolve clashing of routes

This reverts commit b5c57c8.
Closes #2501
Closes #2496

Author: christopherthielen

Diff for: src/urlRouter.js

@@ -305,12 +305,6 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
       return listener;
     }
 
-    rules.sort(function(ruleA, ruleB) {
-      var aLength = ruleA.prefix ? ruleA.prefix.length : 0;
-      var bLength = ruleB.prefix ? ruleB.prefix.length : 0;
-      return bLength - aLength;
-    });
-
     if (!interceptDeferred) listen();
 
     return {

Diff for: test/stateSpec.js

@@ -111,7 +111,7 @@ describe('state', function () {
         }
       })
       .state('resolveTimeout', {
-        url: "/:foo",
+        url: "/resolve-timeout/:foo",
         resolve: {
           value: function ($timeout) {
             return $timeout(function() { log += "Success!"; }, 1);

Diff for: test/urlRouterSpec.js

@@ -55,8 +55,6 @@ describe("UrlRouter", function () {
           return path.replace('baz', 'b4z');
         }).when('/foo/:param', function($match) {
           match = ['/foo/:param', $match];
-        }).when('/foo/bar', function($match) {
-          match = ['/foo/bar', $match];
         }).when('/bar', function($match) {
           match = ['/bar', $match];
         });
@@ -73,18 +71,6 @@ describe("UrlRouter", function () {
       });
     });
 
-    it("should handle more specified url first", function() {
-      location.path("/foo/bar");
-      scope.$emit("$locationChangeSuccess");
-      expect(match[0]).toBe("/foo/bar");
-      expect(match[1]).toEqual({});
-
-      location.path("/foo/baz");
-      scope.$emit("$locationChangeSuccess");
-      expect(match[0]).toBe("/foo/:param");
-      expect(match[1]).toEqual({param: 'baz'});
-    });
-
     it("should execute rewrite rules", function () {
       location.path("/foo");
       scope.$emit("$locationChangeSuccess");