diff --git a/.jscs.json.todo b/.jscs.json.todo
deleted file mode 100644
index 5e52d23ed7a6..000000000000
--- a/.jscs.json.todo
+++ /dev/null
@@ -1,15 +0,0 @@
-// This is an incomplete TODO list of checks we want to start enforcing
-//
-// The goal is to enable these checks one by one by moving them to .jscs.json along with commits
-// that correct the existing code base issues and make the new check pass.
-
-{
-  "validateParameterSeparator": ", ", // Re-assert this rule when JSCS allows multiple spaces
-  "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
-  "disallowImplicitTypeConversion": ["string"],
-  "disallowMultipleLineBreaks": true,
-  "validateJSDoc": {
-    "checkParamNames": true,
-    "requireParamTypes": true
-  }
-}
diff --git a/.jscs.json b/.jscsrc
similarity index 100%
rename from .jscs.json
rename to .jscsrc
diff --git a/.travis.yml b/.travis.yml
index 49139f994228..db65c2d1bcef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,14 @@
 language: node_js
+sudo: false
 node_js:
   - '0.10'
 
+cache:
+  directories:
+    - node_modules
+    - bower_components
+    - docs/bower_components
+
 branches:
   except:
     - /^g3_.*$/
@@ -27,15 +34,21 @@ env:
 matrix:
   allow_failures:
     - env: "JOB=unit BROWSER_PROVIDER=browserstack"
+    - env: "JOB=docs-e2e BROWSER_PROVIDER=browserstack"
+    - env: "JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=browserstack"
+    - env: "JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=browserstack"
 
 install:
+  # Check the size of caches
+  - du -sh ./node_modules ./bower_components/ ./docs/bower_components/ || true
   # - npm config set registry http://23.251.144.68
   # Disable the spinner, it looks bad on Travis
   - npm config set spin false
   # Log HTTP requests
   - npm config set loglevel http
-  - time ./scripts/travis/npm-bundle-deps.sh
-  - time npm install
+  - npm install -g npm@2.5
+  # Instal npm dependecies and ensure that npm cache is not stale
+  - scripts/npm/install-dependencies.sh
 
 before_script:
   - mkdir -p $LOGS_DIR
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7a6a6c5dabd..caec56ebeb6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,953 @@
+<a name="1.4.3"></a>
+# 1.4.3 foam-acceleration (2015-07-15)
+
+
+## Bug Fixes
+
+- **$animateCss:** ensure animations execute if only a keyframeStyle is provided
+  ([97d79eec](https://github.com/angular/angular.js/commit/97d79eec80092f5fae3336c23aa881a72436de55),
+   [#12124](https://github.com/angular/angular.js/issues/12124), [#12340](https://github.com/angular/angular.js/issues/12340))
+- **loader:** define isFunction
+  ([9ea52d81](https://github.com/angular/angular.js/commit/9ea52d818bcd2fb3ea8ccc85bf47f9fd5af68843))
+- **ngAnimate:** ensure that orphaned elements do not throw errors when animated
+  ([e4aeae0c](https://github.com/angular/angular.js/commit/e4aeae0c7303b94135e6df20e6c5e25f2aa0f586),
+   [#11975](https://github.com/angular/angular.js/issues/11975), [#12338](https://github.com/angular/angular.js/issues/12338))
+
+
+
+<a name="1.4.2"></a>
+# 1.4.2 nebular-readjustment (2015-07-06)
+
+## Bug Fixes
+
+- **$browser:** prevent infinite digest if changing hash when there is no hashPrefix
+  ([f81ff3be](https://github.com/angular/angular.js/commit/f81ff3beb0c9d19d494c5878086fb57476442b8b),
+   [#10423](https://github.com/angular/angular.js/issues/10423), [#12145](https://github.com/angular/angular.js/issues/12145))
+- **$compile:**
+  - throw error when requestng new and isolate scopes (async)
+  ([6333d65b](https://github.com/angular/angular.js/commit/6333d65b76e0796cfbab8a2953af0c8014dba2e1),
+   [#12215](https://github.com/angular/angular.js/issues/12215), [#12217](https://github.com/angular/angular.js/issues/12217))
+- **$location:** allow navigating outside the original base URL
+  ([6903b5ec](https://github.com/angular/angular.js/commit/6903b5ec4c04ed6b7c80ef7d638c48639ccdc4bb),
+   [#11302](https://github.com/angular/angular.js/issues/11302), [#4776](https://github.com/angular/angular.js/issues/4776))
+- **merge:** treat dates as atomic values instead of objects.
+  ([6cbbd966](https://github.com/angular/angular.js/commit/6cbbd966479448591f819cbf904e0a3b757613dc),
+   [#11720](https://github.com/angular/angular.js/issues/11720), [#11720](https://github.com/angular/angular.js/issues/11720))
+- **ngOptions:** only watch numeric properties of an array
+  ([14638f4a](https://github.com/angular/angular.js/commit/14638f4a60053b085565e597fc74bd31cf0d372b))
+- **orderBy:** ensure correct ordering with arrays of objects and no predicate
+  ([48e1f560](https://github.com/angular/angular.js/commit/48e1f5605edd32a63318fd78f5165c7d1f1a20f9),
+   [#11866](https://github.com/angular/angular.js/issues/11866), [#11312](https://github.com/angular/angular.js/issues/11312), [#4282](https://github.com/angular/angular.js/issues/4282))
+
+
+## Features
+
+- **ngAria:** add option to disable role=button
+  ([1f5e42e8](https://github.com/angular/angular.js/commit/1f5e42e8821217026ef36a46d36f84d7cd32830a),
+   [#11580](https://github.com/angular/angular.js/issues/11580), [#12234](https://github.com/angular/angular.js/issues/12234))
+
+
+
+<a name="1.3.17"></a>
+# 1.3.17 tsktskskly-euouae (2015-07-06)
+
+
+## Bug Fixes
+
+- **$browser:** prevent infinite digest if changing hash when there is no hashPrefix
+  ([61a3fb67](https://github.com/angular/angular.js/commit/61a3fb676a186e22564fb0181c17647b35ca4e5e),
+   [#10423](https://github.com/angular/angular.js/issues/10423), [#12145](https://github.com/angular/angular.js/issues/12145))
+- **$location:**
+  - allow navigating outside the original base URL
+  ([0bb57d53](https://github.com/angular/angular.js/commit/0bb57d538f25a1b6f20025d87a451c39671b59aa),
+   [#11302](https://github.com/angular/angular.js/issues/11302), [#4776](https://github.com/angular/angular.js/issues/4776))
+  - do not get caught in infinite digest in IE9
+  ([f486ebe8](https://github.com/angular/angular.js/commit/f486ebe80b6d7854d3eb9029f14d94299cf493cb),
+   [#11439](https://github.com/angular/angular.js/issues/11439), [#11675](https://github.com/angular/angular.js/issues/11675), [#11935](https://github.com/angular/angular.js/issues/11935), [#12083](https://github.com/angular/angular.js/issues/12083))
+- **linky:** allow case insensitive scheme detection
+  ([6b28aef1](https://github.com/angular/angular.js/commit/6b28aef1c537bfb2da21820d6ca154344efe266e),
+   [#12073](https://github.com/angular/angular.js/issues/12073), [#12074](https://github.com/angular/angular.js/issues/12074))
+
+
+
+<a name="1.4.1"></a>
+# 1.4.1 hyperionic-illumination (2015-06-16)
+
+
+## Bug Fixes
+
+- **$compile:**
+  - workaround for IE11 MutationObserver
+  ([f3b1d0b7](https://github.com/angular/angular.js/commit/f3b1d0b723298a5f8ea21d0704405649cce1b5fc),
+   [#11781](https://github.com/angular/angular.js/issues/11781))
+  - prevent exception when using `watch` as isolated scope binding property in Firefox
+  ([a6339d30](https://github.com/angular/angular.js/commit/a6339d30d1379689da5eec9647a953f64821f8b0),
+   [#11627](https://github.com/angular/angular.js/issues/11627))
+  - assign controller return values correctly for multiple directives
+  ([8caf1802](https://github.com/angular/angular.js/commit/8caf1802e0e93389dec626ef35e04a302aa6c39d),
+   [#12029](https://github.com/angular/angular.js/issues/12029), [#12036](https://github.com/angular/angular.js/issues/12036))
+- **$location:** do not get caught in infinite digest in IE9 when redirecting in `$locationChangeSuccess`
+  ([91b60226](https://github.com/angular/angular.js/commit/91b602263b96b6fce1331208462e18eb647f4d60),
+   [#11439](https://github.com/angular/angular.js/issues/11439), [#11675](https://github.com/angular/angular.js/issues/11675), [#11935](https://github.com/angular/angular.js/issues/11935), [#12083](https://github.com/angular/angular.js/issues/12083))
+- **$parse:** set null reference properties to `undefined`
+  ([71fc3f4f](https://github.com/angular/angular.js/commit/71fc3f4fa0cd12eff335d57efed7c033554749f4),
+   [#12099](https://github.com/angular/angular.js/issues/12099))
+  ([d19504a1](https://github.com/angular/angular.js/commit/d19504a179355d7801d59a8db0285a1322e04601),
+   [#11959](https://github.com/angular/angular.js/issues/11959))
+- **$sanitize:** do not remove `tabindex` attribute
+  ([799353c7](https://github.com/angular/angular.js/commit/799353c75de28e6fbf52dac6e0721e85b578575a),
+   [#8371](https://github.com/angular/angular.js/issues/8371), [#5853](https://github.com/angular/angular.js/issues/5853))
+- **copy:** do not copy the same object twice
+  ([0e622f7b](https://github.com/angular/angular.js/commit/0e622f7b5bc3d5d0ab0fbc1a1bc69404bd7216d5))
+- **forms:** parse exponential notation in `numberInputType` directive
+  ([ebd0fbba](https://github.com/angular/angular.js/commit/ebd0fbba8ff90bee0cd016d574643d56a7f81ed0),
+   [#12121](https://github.com/angular/angular.js/issues/12121), [#12122](https://github.com/angular/angular.js/issues/12122))
+- **linky:** allow case insensitive scheme detection
+  ([8dc09e6d](https://github.com/angular/angular.js/commit/8dc09e6dabb84c2c611cdc9e40adfac989648200),
+   [#12073](https://github.com/angular/angular.js/issues/12073), [#12073](https://github.com/angular/angular.js/issues/12073))
+- **ngAria:**
+  - update `aria-valuemin/max` when `min/max` change
+  ([ebaa0f59](https://github.com/angular/angular.js/commit/ebaa0f598501702ae64d59ada0ae492eaf0e2db6),
+   [#11770](https://github.com/angular/angular.js/issues/11770), [#11774](https://github.com/angular/angular.js/issues/11774))
+  - ensure boolean values for aria-hidden and aria-disabled
+  ([59273354](https://github.com/angular/angular.js/commit/59273354b57dd8d1ad2cd2f4740ffa8923e480f9),
+   [#11365](https://github.com/angular/angular.js/issues/11365))
+- **ngModel:** ignore Object.prototype properties on the form validation object
+  ([0934b76b](https://github.com/angular/angular.js/commit/0934b76b72cec86093414834ac4cb7f0946b651d),
+   [#12066](https://github.com/angular/angular.js/issues/12066))
+- **ngOptions:**
+  - do not watch properties starting with $
+  ([34a6da24](https://github.com/angular/angular.js/commit/34a6da24c17356d4ffc70aec3f621a140a9a61ab),
+   [#11930](https://github.com/angular/angular.js/issues/11930), [#12010](https://github.com/angular/angular.js/issues/12010))
+  - use reference check only when not using trackBy
+  ([d7dc14dc](https://github.com/angular/angular.js/commit/d7dc14dc0cdeb9c187d227e19acc8aca7df9d740),
+   [#11936](https://github.com/angular/angular.js/issues/11936), [#11996](https://github.com/angular/angular.js/issues/11996))
+
+
+## Features
+
+- **$compile:** show module name during `multidir` error
+  ([351fe4b7](https://github.com/angular/angular.js/commit/351fe4b79c50a45a11af2fcd2aa7b6fd3b70058d),
+   [#11775](https://github.com/angular/angular.js/issues/11775))
+- **$q:** $q.resolve as an alias for $q.when
+  ([3ef52980](https://github.com/angular/angular.js/commit/3ef529806fef28b41ca4af86a330f39a95699cf6),
+   [#11944](https://github.com/angular/angular.js/issues/11944), [#11987](https://github.com/angular/angular.js/issues/11987))
+
+
+## Performance Improvements
+
+- **$compile:** avoid jquery data calls when there is no data
+  ([9efb0d5e](https://github.com/angular/angular.js/commit/9efb0d5ee961b57c8fc144a3138a15955e4010e2))
+
+
+
+<a name="1.3.16"></a>
+# 1.3.16 cookie-oatmealification (2015-06-05)
+
+
+## Bug Fixes
+
+- **$compile:** throw error on invalid directive name
+  ([634e4671](https://github.com/angular/angular.js/commit/634e467172efa696eb32ef8942ffbedeecbd030e),
+   [#11281](https://github.com/angular/angular.js/issues/11281), [#11109](https://github.com/angular/angular.js/issues/11109))
+- **$cookies:** update $cookies to prevent duplicate cookie writes and play nice with external code
+  ([706a93ab](https://github.com/angular/angular.js/commit/706a93ab6960e3474698ccf9a8048b3c32e567c6),
+   [#11490](https://github.com/angular/angular.js/issues/11490), [#11515](https://github.com/angular/angular.js/issues/11515))
+- **$http:** throw error if `success` and `error` methods do not receive a function
+  ([731e1f65](https://github.com/angular/angular.js/commit/731e1f6534ab7fd1e053b8d7a25c902fcd934fea),
+   [#11330](https://github.com/angular/angular.js/issues/11330), [#11333](https://github.com/angular/angular.js/issues/11333))
+- **core:** ensure that multiple requests to requestAnimationFrame are buffered
+  ([0adc0364](https://github.com/angular/angular.js/commit/0adc0364265b06c567ccc8e90a7f09cc46f235b2),
+   [#11791](https://github.com/angular/angular.js/issues/11791))
+- **filterFilter:** fix matching against `null`/`undefined`
+  ([9dd0fe35](https://github.com/angular/angular.js/commit/9dd0fe35d1027e59b84b2396abee00d8683f3b50),
+   [#11573](https://github.com/angular/angular.js/issues/11573), [#11617](https://github.com/angular/angular.js/issues/11617))
+- **jqLite:**
+  - check for "length" in obj in isArrayLike to prevent iOS8 JIT bug from surfacing
+  ([647f3f55](https://github.com/angular/angular.js/commit/647f3f55eb7100a255272f7277f0f962de234a32),
+   [#11508](https://github.com/angular/angular.js/issues/11508))
+  - attr should ignore comment, text and attribute nodes
+  ([181e5ebc](https://github.com/angular/angular.js/commit/181e5ebc3fce5312feacaeace4fcad0d32f4d73c))
+- **ngAnimate:**
+  - ensure that minified repaint code isn't removed
+  ([d5c99ea4](https://github.com/angular/angular.js/commit/d5c99ea42b834343fd0362cfc572f47e7536ccfb),
+   [#9936](https://github.com/angular/angular.js/issues/9936))
+- **ngAria:** handle elements with role="checkbox/menuitemcheckbox"
+  ([1c282af5](https://github.com/angular/angular.js/commit/1c282af5abc205d4aac37c05c5cb725d71747134),
+   [#11317](https://github.com/angular/angular.js/issues/11317), [#11321](https://github.com/angular/angular.js/issues/11321))
+- **ngModel:** allow setting model to NaN when asyncValidator is present
+  ([b64519fe](https://github.com/angular/angular.js/commit/b64519fea7f1a5ec75e32c4b71b012b827314153),
+   [#11315](https://github.com/angular/angular.js/issues/11315), [#11411](https://github.com/angular/angular.js/issues/11411))
+- **ngTouch:**
+  - check undefined tagName for SVG event target
+  ([7560a8d2](https://github.com/angular/angular.js/commit/7560a8d2d65955ddb60ede9d586502f4e3cbd062))
+  - register touches properly when jQuery is used
+  ([40441f6d](https://github.com/angular/angular.js/commit/40441f6dfc5ebd5cdc679c269c4639238f5351eb),
+   [#4001](https://github.com/angular/angular.js/issues/4001), [#8584](https://github.com/angular/angular.js/issues/8584), [#10797](https://github.com/angular/angular.js/issues/10797), [#11488](https://github.com/angular/angular.js/issues/11488))
+- **select:** prevent unknown option being added to select when bound to null property
+  ([9e3f82bb](https://github.com/angular/angular.js/commit/9e3f82bbaf83cad7bb3121db756099b0880562e6),
+   [#11872](https://github.com/angular/angular.js/issues/11872), [#11875](https://github.com/angular/angular.js/issues/11875))
+
+
+## Features
+
+- **travis:** run unit tests on iOS 8
+  ([1f650871](https://github.com/angular/angular.js/commit/1f650871266b88b3dab4a894a839a82ac9a06b69),
+   [#11479](https://github.com/angular/angular.js/issues/11479))
+
+
+
+<a name="1.4.0"></a>
+# 1.4.0 jaracimrman-existence (2015-05-26)
+
+
+## Bug Fixes
+
+- **$animate:**
+  - ignore invalid option parameter values
+  ([72edd4df](https://github.com/angular/angular.js/commit/72edd4dff931c644eecb8f0d1c878dc839c76947),
+   [#11826](https://github.com/angular/angular.js/issues/11826))
+  - accept unwrapped DOM elements as inputs for enter + move
+  ([f26fc26f](https://github.com/angular/angular.js/commit/f26fc26f6ea283b2fc5ddb18627b13850de2663e),
+   [#11848](https://github.com/angular/angular.js/issues/11848))
+- **$animateCss:** ensure that custom durations do not confuse the gcs cache
+  ([e0e1b520](https://github.com/angular/angular.js/commit/e0e1b5208767dd62f5586fdc607cb2e31dac9516),
+   [#11723](https://github.com/angular/angular.js/issues/11723), [#11852](https://github.com/angular/angular.js/issues/11852))
+- **$http:** do not modify the config object passed into $http short methods
+  ([f7a4b481](https://github.com/angular/angular.js/commit/f7a4b48121ed2b04af89bd2b754f500d1872360d))
+- **ngAnimate:**
+  - close follow-up class-based animations when the same class is added/removed when removed/added
+  ([db246eb7](https://github.com/angular/angular.js/commit/db246eb701529b41049fc118908e528920f13b24),
+   [#11717](https://github.com/angular/angular.js/issues/11717))
+  - ensure nested class-based animations are spaced out with a RAF
+  ([213c2a70](https://github.com/angular/angular.js/commit/213c2a703293ee0af8229dde2b608687cd77ccfa),
+   [#11812](https://github.com/angular/angular.js/issues/11812))
+  - class-based animations must not set addClass/removeClass CSS classes on the element
+  ([3a3db690](https://github.com/angular/angular.js/commit/3a3db690a16e888aa7371e3b02e2954b9ec2d558),
+   [#11810](https://github.com/angular/angular.js/issues/11810))
+  - ensure that repeated structural calls during pre-digest function
+  ([2327f5a0](https://github.com/angular/angular.js/commit/2327f5a0a7e018a9b03aefabe1fbd0c9330e2eeb),
+   [#11867](https://github.com/angular/angular.js/issues/11867))
+  - ensure that cancelled class-based animations are properly cleaned up
+  ([718ff844](https://github.com/angular/angular.js/commit/718ff84405558ac64402e1fca5caefd7d307ea1e),
+   [#11652](https://github.com/angular/angular.js/issues/11652))
+  - throw an error if a callback is passed to animate methods
+  ([9bb4d6cc](https://github.com/angular/angular.js/commit/9bb4d6ccbe80b7704c6b7f53317ca8146bc103ca),
+   [#11826](https://github.com/angular/angular.js/issues/11826), [#11713](https://github.com/angular/angular.js/issues/11713))
+  - ensure anchored animations remove the leave element at correct time
+  ([64c66d0e](https://github.com/angular/angular.js/commit/64c66d0eea11b575d2a71d00c70cfc5be12cd450),
+   [#11850](https://github.com/angular/angular.js/issues/11850))
+- **select:** prevent unknown option being added to select when bound to null property
+  ([4090491c](https://github.com/angular/angular.js/commit/4090491c73910c169d4fba0494a4e26b45dca7ec),
+   [#11872](https://github.com/angular/angular.js/issues/11872), [#11875](https://github.com/angular/angular.js/issues/11875))
+
+
+## Features
+
+- **filterFilter:** allow array like objects to be filtered
+  ([1b0d0fd8](https://github.com/angular/angular.js/commit/1b0d0fd8d00b42dffd798845fe0947d594372613),
+   [#11782](https://github.com/angular/angular.js/issues/11782), [#11787](https://github.com/angular/angular.js/issues/11787))
+
+
+
+<a name="1.4.0-rc.2"></a>
+# 1.4.0-rc.2 rocket-zambonimation (2015-05-12)
+
+
+## Bug Fixes
+
+- **$compile:** ensure directive names have no leading or trailing whitespace
+  ([bab474aa](https://github.com/angular/angular.js/commit/bab474aa8b146f6732857c3af1a8b3b010fda8b0),
+   [#11397](https://github.com/angular/angular.js/issues/11397), [#11772](https://github.com/angular/angular.js/issues/11772))
+- **$httpParamSerializerJQLike:** follow jQuery logic for nested params
+  ([2420a0a7](https://github.com/angular/angular.js/commit/2420a0a77e27b530dbb8c41319b2995eccf76791),
+   [#11551](https://github.com/angular/angular.js/issues/11551), [#11635](https://github.com/angular/angular.js/issues/11635))
+- **jqLite:** check for "length" in obj in isArrayLike to prevent iOS8 JIT bug from surfacing
+  ([426a5ac0](https://github.com/angular/angular.js/commit/426a5ac0547109648e5c5e358f668c274a111ab2),
+   [#11508](https://github.com/angular/angular.js/issues/11508))
+- **ngAnimate:**
+  - ensure that multiple requests to requestAnimationFrame are buffered
+  ([db20b830](https://github.com/angular/angular.js/commit/db20b830fc6074a00dc11d3f47d665c55e8bb515),
+   [#11791](https://github.com/angular/angular.js/issues/11791))
+  - ensure that an object is always returned even when no animation is set to run
+  ([d5683d21](https://github.com/angular/angular.js/commit/d5683d21165e725bc5a850e795f681b0a8a008f5))
+  - force use of `ng-anchor` instead of a suffixed `-anchor` CSS class when triggering anchor animations
+  ([df24410c](https://github.com/angular/angular.js/commit/df24410c17d51a8d44929b9cffee2c91cedfed72))
+  - rename `ng-animate-anchor` to `ng-anchor`
+  ([e6d053de](https://github.com/angular/angular.js/commit/e6d053de0993c0d38de46ad8a9c6760537316430))
+  - ensure that shared CSS classes between anchor nodes are retained
+  ([e0014002](https://github.com/angular/angular.js/commit/e0014002370278778077d0612f9fab6beb80d07a),
+   [#11681](https://github.com/angular/angular.js/issues/11681))
+  - prohibit usage of the `ng-animate` class with classNameFilter
+  ([1002b80a](https://github.com/angular/angular.js/commit/1002b80a6fb5d98c424a01330234276d65d93c0b),
+   [#11431](https://github.com/angular/angular.js/issues/11431), [#11807](https://github.com/angular/angular.js/issues/11807))
+  - ensure that the temporary CSS classes are applied before detection
+  ([f7e9ff1a](https://github.com/angular/angular.js/commit/f7e9ff1aba9ed70835c084e6e154f6b0bf9c3a19),
+   [#11769](https://github.com/angular/angular.js/issues/11769), [#11804](https://github.com/angular/angular.js/issues/11804))
+  - ensure that all jqLite elements are deconstructed properly
+  ([64d05180](https://github.com/angular/angular.js/commit/64d05180a667e586328fbdbd328889d3b003571d),
+   [#11658](https://github.com/angular/angular.js/issues/11658))
+  - ensure animations are not attempted on text nodes
+  ([2aacc2d6](https://github.com/angular/angular.js/commit/2aacc2d622893e05eb94b3974d562e681cc3a17f),
+   [#11703](https://github.com/angular/angular.js/issues/11703))
+  - ensure JS animations recognize $animateCss directly
+  ([0681a540](https://github.com/angular/angular.js/commit/0681a5400e4150a961f9c8651e55623ca23b0cc2))
+- **ngClass:** add/remove classes which are properties of Object.prototype
+  ([f7b99970](https://github.com/angular/angular.js/commit/f7b999703f4f3bdaea035ce692f1a656b0c1a933),
+   [#11813](https://github.com/angular/angular.js/issues/11813), [#11814](https://github.com/angular/angular.js/issues/11814))
+- **ngOptions:**
+  - ensure that tracked properties are always watched
+  ([b5a9053b](https://github.com/angular/angular.js/commit/b5a9053ba33d48db2482ca6736d1fcae8b33d0f8),
+   [#11784](https://github.com/angular/angular.js/issues/11784))
+  - ensure label is watched in all cases
+  ([ae98dadf](https://github.com/angular/angular.js/commit/ae98dadf6dca3313746f42a441c7659654dd9d50),
+   [#11765](https://github.com/angular/angular.js/issues/11765))
+  - iterate over the options collection in the same way as `ngRepeat`
+  ([dfa722a8](https://github.com/angular/angular.js/commit/dfa722a8a6864793fd9580d8ae704a06d10b5509),
+   [#11733](https://github.com/angular/angular.js/issues/11733))
+  - use watchCollection not deep watch of ngModel
+  ([47f9fc3e](https://github.com/angular/angular.js/commit/47f9fc3e70bc361e8c11fe68dc3ec4489238efb3),
+   [#11372](https://github.com/angular/angular.js/issues/11372), [#11653](https://github.com/angular/angular.js/issues/11653), [#11743](https://github.com/angular/angular.js/issues/11743))
+- **ngTouch:**
+  - check undefined tagName for SVG event target
+  ([74eb17d7](https://github.com/angular/angular.js/commit/74eb17d7c8232f72f134bf2546f10fed7234d276))
+  - don't prevent click event after a touchmove
+  ([95521876](https://github.com/angular/angular.js/commit/95521876eb9eb330548b0549f0cfe22a26d88f6e),
+   [#10985](https://github.com/angular/angular.js/issues/10985))
+
+
+## Features
+
+- **$resource:** include request context in error message
+  ([266bc652](https://github.com/angular/angular.js/commit/266bc6520ba4d188dbc949643def102604f98905),
+   [#11363](https://github.com/angular/angular.js/issues/11363))
+
+
+## Breaking Changes
+
+### ngAnimate
+
+- **$animateCss:** due to [d5683d21](https://github.com/angular/angular.js/commit/d5683d21165e725bc5a850e795f681b0a8a008f5),
+  The $animateCss service will now always return an
+object even if the animation is not set to run. If your code is using
+$animateCss then please consider the following code change:
+
+```
+// before
+var animator = $animateCss(element, { ... });
+if (!animator) {
+  continueApp();
+  return;
+}
+var runner = animator.start();
+runner.done(continueApp);
+runner.then(continueApp);
+
+// now
+var animator = $animateCss(element, { ... });
+var runner = animator.start();
+runner.done(continueApp);
+runner.then(continueApp);
+```
+
+- due to [df24410c](https://github.com/angular/angular.js/commit/df24410c17d51a8d44929b9cffee2c91cedfed72),
+Prior to this fix there were to ways to apply CSS
+animation code to an anchor animation. With this fix, the suffixed
+CSS -anchor classes are now not used anymore for CSS anchor animations.
+
+Instead just use the `ng-anchor` CSS class like so:
+
+```html
+<div class="container-animation" ng-if="on">
+   <div ng-animate-ref="1" class="my-anchor-element"></div>
+</div>
+
+<div class="container-animation" ng-if="!on">
+   <div ng-animate-ref="1" class="my-anchor-element"></div>
+</div>
+```
+
+**before**:
+```css
+/* before (notice the container-animation CSS class) */
+.container-animation-anchor {
+  transition:0.5s linear all;
+}
+```
+
+**now**:
+```css
+/* now (just use `ng-anchor` on a class that both the
+   elements that contain `ng-animate-ref` share) */
+.my-anchor-element.ng-anchor {
+  transition:0.5s linear all;
+}
+```
+
+- due to [e6d053de](https://github.com/angular/angular.js/commit/e6d053de0993c0d38de46ad8a9c6760537316430),
+if your CSS code made use of the `ng-animate-anchor`
+CSS class for referencing the anchored animation element then your
+code must now use `ng-anchor` instead.
+
+- due to [1002b80a](https://github.com/angular/angular.js/commit/1002b80a6fb5d98c424a01330234276d65d93c0b),
+partially or fully using a regex value containing
+`ng-animate` as a token is not allowed anymore. Doing so will trigger a
+minErr exception to be thrown.
+
+So don't do this:
+
+```js
+// only animate elements that contain the `ng-animate` CSS class
+$animateProvider.classNameFilter(/ng-animate/);
+
+// or partially contain it
+$animateProvider.classNameFilter(/some-class ng-animate another-class/);
+```
+
+but this is OK:
+
+```js
+$animateProvider.classNameFilter(/ng-animate-special/);
+```
+
+
+### ngOptions
+
+- ** due to [dfa722a8](https://github.com/angular/angular.js/commit/dfa722a8a6864793fd9580d8ae704a06d10b5509),
+
+
+Although it is unlikely that anyone is using it in this way, this change does change the
+behaviour of `ngOptions` in the following case:
+
+  * you are iterating over an array-like object, using the array form of the `ngOptions` syntax
+(`item.label for item in items`) and that object contains non-numeric property keys.
+
+In this case these properties with non-numeric keys will be ignored.
+
+** Here array-like is defined by the result of a call to this internal function:
+https://github.com/angular/angular.js/blob/v1.4.0-rc.1/src/Angular.js#L198-L211 **
+
+To get the desired behaviour you need to iterate using the object form of the `ngOptions` syntax
+(`value.label` for (key, value) in items)`).
+
+
+
+
+<a name="v1.4.0-rc.1"></a>
+# v1.4.0-rc.1 sartorial-chronography (2015-04-24)
+
+
+## Bug Fixes
+
+- **$animate:**
+  - ensure that from styles are applied for class-based animations
+  ([8f819d2c](https://github.com/angular/angular.js/commit/8f819d2cb5c8025b25534529a6e897dc8805885b))
+  - make sure the JS animation lookup is an object lookup
+  ([103a39ca](https://github.com/angular/angular.js/commit/103a39ca8dad0300bead15c358aad846510b2229),
+   [#11619](https://github.com/angular/angular.js/issues/11619))
+- **$animateCss:** ensure that rAF waiting loop doesn't ignore pending items during a flush
+  ([90e424b2](https://github.com/angular/angular.js/commit/90e424b206239e261024e8ef7fcac762236cd8b7))
+- **$http:** stop coercing falsy HTTP request bodies to null / empty body
+  ([e04a887c](https://github.com/angular/angular.js/commit/e04a887c9b506de18516600310fe6e529d9d2ca3),
+   [#11552](https://github.com/angular/angular.js/issues/11552), [#11593](https://github.com/angular/angular.js/issues/11593))
+- **ngAnimate:**
+  - close parent animations only when there are classes to resolve
+  ([1459be17](https://github.com/angular/angular.js/commit/1459be170dabfca40501dcf219dfced5ba513169))
+  - ensure ngClass-based classes are always resolved for CSS-enabled animations
+  ([89f081e4](https://github.com/angular/angular.js/commit/89f081e452e9a75c2d3bf86bfef8b7f9bd1f2b0e))
+  - do not abort animation if only `ng-anchor-in` is used
+  ([3333a5c3](https://github.com/angular/angular.js/commit/3333a5c380f830cba8efec5825cb6648f930f206))
+  - ensure that a filtered-out leave animation always runs its DOM operation
+  ([6dd64ab5](https://github.com/angular/angular.js/commit/6dd64ab5f34fa19db8f90e6eabc810843089ba14),
+   [#11555](https://github.com/angular/angular.js/issues/11555))
+  - ensure that animations work when the app is bootstrapped on the document node
+  ([bee14ed1](https://github.com/angular/angular.js/commit/bee14ed1e7b77ea7dc62326611380da36dec297e),
+   [#11574](https://github.com/angular/angular.js/issues/11574))
+  - ensure SVG classes are properly removed
+  ([fa0bbded](https://github.com/angular/angular.js/commit/fa0bbded1ea040fbfdb1a4339e4a374fe9717a82))
+- **ngAria:** change accessibility keypress event to use event.which if it is provided
+  ([249f9b81](https://github.com/angular/angular.js/commit/249f9b81cbad5c57cf978a47842744aadd85cdb4),
+   [#11340](https://github.com/angular/angular.js/issues/11340))
+- **ngMessageFormat:**
+  - ensure bindings are valid for Protractor
+  ([992114f7](https://github.com/angular/angular.js/commit/992114f7a7f5f39778753e0c49458f14b6290ffc),
+   [#11644](https://github.com/angular/angular.js/issues/11644), [#11649](https://github.com/angular/angular.js/issues/11649))
+  - minified symbol and nested required expression
+  ([8a45064f](https://github.com/angular/angular.js/commit/8a45064f2bdec13ba3de5b0a0785df76188ab172),
+   [#11414](https://github.com/angular/angular.js/issues/11414), [#11592](https://github.com/angular/angular.js/issues/11592))
+- **select:** allow empty option to be added dynamically by ng-repeat
+  ([abf59c28](https://github.com/angular/angular.js/commit/abf59c285c3ff6af20dbf4236eba5204ae735abb),
+   [#11470](https://github.com/angular/angular.js/issues/11470), [#11512](https://github.com/angular/angular.js/issues/11512))
+
+
+## Features
+
+- **$animate:** provide support for animations on elements outside of $rootElement
+  ([e41faaa2](https://github.com/angular/angular.js/commit/e41faaa2a155a42bcc66952497a6f33866878508))
+
+
+
+
+<a name="v1.4.0-rc.0"></a>
+# v1.4.0-rc.0 smooth-unwinding (2015-04-10)
+
+
+## Bug Fixes
+
+- **$compile:**
+  - throw error on invalid directive name
+  ([170ff9a3](https://github.com/angular/angular.js/commit/170ff9a37dea8772dda7c89e84176ac1a8992878),
+   [#11281](https://github.com/angular/angular.js/issues/11281), [#11109](https://github.com/angular/angular.js/issues/11109))
+  - update data() when controller returns custom value
+  ([9900610e](https://github.com/angular/angular.js/commit/9900610eea4ece87b063f2aa9d82c75c369927df),
+   [#11147](https://github.com/angular/angular.js/issues/11147), [#11326](https://github.com/angular/angular.js/issues/11326))
+- **$http:** throw error if `success` and `error` methods do not receive a function
+  ([1af563d4](https://github.com/angular/angular.js/commit/1af563d43e74cb7be53e815b66fd91dd93986ed6),
+   [#11330](https://github.com/angular/angular.js/issues/11330), [#11333](https://github.com/angular/angular.js/issues/11333))
+- **$parse:** fix parse errors on older Android WebViews which choke with reserved keywords
+  ([10ae33b2](https://github.com/angular/angular.js/commit/10ae33b2d88b04df76f519edc50a47fa30f83e96),
+   [#11455](https://github.com/angular/angular.js/issues/11455))
+- **$rootScope:** allow destroying a root scope
+  ([f8c8cf69](https://github.com/angular/angular.js/commit/f8c8cf698aa23640249d79fd405605694478e4f7),
+   [#11241](https://github.com/angular/angular.js/issues/11241), [#10895](https://github.com/angular/angular.js/issues/10895))
+- **cookieReader:** safely access $document so it can be mocked
+  ([a057e089](https://github.com/angular/angular.js/commit/a057e0896a7fe2fdaba50b2515555b86e4f4be27),
+   [#11373](https://github.com/angular/angular.js/issues/11373), [#11388](https://github.com/angular/angular.js/issues/11388))
+- **filterFilter:** fix matching against `null`/`undefined`
+  ([b5002ab6](https://github.com/angular/angular.js/commit/b5002ab62ad6e13f4339e20106e1fdece14912a2),
+   [#11432](https://github.com/angular/angular.js/issues/11432), [#11445](https://github.com/angular/angular.js/issues/11445))
+- **ngAnimate:** ensure that minified repaint code isn't removed
+  ([c55a4944](https://github.com/angular/angular.js/commit/c55a494433e619aad0c7ef9fddadc0b3fdf53915),
+   [#9936](https://github.com/angular/angular.js/issues/9936))
+- **ngAria:** handle elements with role="checkbox/menuitemcheckbox"
+  ([44337f63](https://github.com/angular/angular.js/commit/44337f63fa94116795e83e3a764a6ba6782809c7),
+   [#11317](https://github.com/angular/angular.js/issues/11317), [#11321](https://github.com/angular/angular.js/issues/11321))
+- **ngModel:** allow setting model to NaN when asyncValidator is present
+  ([948120ec](https://github.com/angular/angular.js/commit/948120ecdbc4dd07880c0107564c50c7675b8a93),
+   [#11315](https://github.com/angular/angular.js/issues/11315), [#11411](https://github.com/angular/angular.js/issues/11411))
+- **ngTouch:** register touches properly when jQuery is used
+  ([06a9f0a9](https://github.com/angular/angular.js/commit/06a9f0a95f0e72fa2e9879fe8a49e9bf69986a5f),
+   [#4001](https://github.com/angular/angular.js/issues/4001), [#8584](https://github.com/angular/angular.js/issues/8584), [#10797](https://github.com/angular/angular.js/issues/10797), [#11488](https://github.com/angular/angular.js/issues/11488))
+- **select:** don't call $render twice if $viewValue ref changes
+  ([7e5c447f](https://github.com/angular/angular.js/commit/7e5c447fa9ad7d81cc818d6e79392c3e4a6b23a0),
+   [#11329](https://github.com/angular/angular.js/issues/11329), [#11412](https://github.com/angular/angular.js/issues/11412))
+
+
+## Features
+
+- **$anchorScroll:** allow scrolling to a specified element
+  ([731c8b5e](https://github.com/angular/angular.js/commit/731c8b5e2d01a44aa91f967f1a6acbadb8005a8b),
+   [#4568](https://github.com/angular/angular.js/issues/4568), [#9596](https://github.com/angular/angular.js/issues/9596))
+- **$animate:** complete refactor of internal animation code
+  ([c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef))
+- **$http:** support custom params serializers
+  ([6c8464ad](https://github.com/angular/angular.js/commit/6c8464ad14dd308349f632245c1a064c9aae242a),
+   [#3740](https://github.com/angular/angular.js/issues/3740), [#7429](https://github.com/angular/angular.js/issues/7429), [#9224](https://github.com/angular/angular.js/issues/9224), [#11461](https://github.com/angular/angular.js/issues/11461))
+- **$interpolate:** extend interpolation with MessageFormat like syntax
+  ([1e58488a](https://github.com/angular/angular.js/commit/1e58488ad65abf7031bab5813523bb9d86dbd28c),
+   [#11152](https://github.com/angular/angular.js/issues/11152))
+- **angular.Module:** add `decorator` method
+  ([e57138d7](https://github.com/angular/angular.js/commit/e57138d7eff1210f99238c475fff57530bf0ab19),
+   [#11305](https://github.com/angular/angular.js/issues/11305), [#11300](https://github.com/angular/angular.js/issues/11300))
+- **ngClass:** add support for conditional map within an array.
+  ([4588e627](https://github.com/angular/angular.js/commit/4588e627bb7238b2113241919b948d0e5166c76d),
+   [#4807](https://github.com/angular/angular.js/issues/4807))
+- **travis:** run unit tests on iOS 8
+  ([2cdb2016](https://github.com/angular/angular.js/commit/2cdb2016b9d89abfb5ab988b67d5f26f3bf21908),
+   [#11479](https://github.com/angular/angular.js/issues/11479))
+
+
+## Performance Improvements
+
+- **$rootScope:** remove history event handler when app is torn down
+  ([d996305b](https://github.com/angular/angular.js/commit/d996305b4470f80fbb1cbddf54b7d10ffbb6ab47),
+   [#9897](https://github.com/angular/angular.js/issues/9897), [#9905](https://github.com/angular/angular.js/issues/9905))
+- **benchmark:** add ngmodel benchmarks to largetable-bp
+  ([b8dbdb0c](https://github.com/angular/angular.js/commit/b8dbdb0c5e2cd176c6d94d60f781cfc02e646592),
+   [#11082](https://github.com/angular/angular.js/issues/11082))
+- **ngOptions:** only perform deep equality check on ngModel if using track by
+  ([171b9f7f](https://github.com/angular/angular.js/commit/171b9f7f2339ef9047b8526b2c3f36bb58d14feb),
+   [#11448](https://github.com/angular/angular.js/issues/11448), [#11447](https://github.com/angular/angular.js/issues/11447))
+
+
+## Breaking Changes
+
+- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+  JavaScript and CSS animations can no longer be run in
+parallel. With earlier versions of ngAnimate, both CSS and JS animations
+would be run together when multiple animations were detected. This
+feature has now been removed, however, the same effect, with even more
+possibilities, can be achieved by injecting `$animateCss` into a
+JavaScript-defined animation and creating custom CSS-based animations
+from there. Read the ngAnimate docs for more info.
+
+- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+  The function params for `$animate.enabled()` when an
+element is used are now flipped. This fix allows the function to act as
+a getter when a single element param is provided.
+
+```js
+// < 1.4
+$animate.enabled(false, element);
+
+// 1.4+
+$animate.enabled(element, false);
+```
+
+- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+  In addition to disabling the children of the element,
+`$animate.enabled(element, false)` will now also disable animations on
+the element itself.
+
+- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+  Animation-related callbacks are now fired on
+`$animate.on` instead of directly being on the element.
+
+```js
+// < 1.4
+element.on('$animate:before', function(e, data) {
+  if (data.event === 'enter') { ... }
+});
+element.off('$animate:before', fn);
+
+// 1.4+
+$animate.on(element, 'enter', function(data) {
+  //...
+});
+$animate.off(element, 'enter', fn);
+```
+
+- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+  There is no need to call `$scope.$apply` or
+`$scope.$digest` inside of an animation promise callback anymore
+since the promise is resolved within a digest automatically (but a
+digest is not run unless the promise is chained).
+
+```js
+// < 1.4
+$animate.enter(element).then(function() {
+  $scope.$apply(function() {
+    $scope.explode = true;
+  });
+});
+
+// 1.4+
+$animate.enter(element).then(function() {
+  $scope.explode = true;
+});
+```
+
+- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+  When an enter, leave or move animation is triggered then it
+will always end any pending or active parent class based animations
+(animations triggered via ngClass) in order to ensure that any CSS
+styles are resolved in time.
+
+
+
+
+<a name="1.4.0-beta.6"></a>
+# 1.4.0-beta.6 cookie-liberation (2015-03-17)
+
+
+## Bug Fixes
+
+- **$animate:** call `applyStyles` from options on `leave`
+  ([4374f892](https://github.com/angular/angular.js/commit/4374f892c6fa4af6ba1f2ed47c5f888fdb5fadc5),
+   [#10068](https://github.com/angular/angular.js/issues/10068))
+- **$browser:**  don't crash if `history.state` access causes error in IE
+  ([3b8163b7](https://github.com/angular/angular.js/commit/3b8163b7b664f24499e75460ab50c066eaec0f78),
+   [#10367](https://github.com/angular/angular.js/issues/10367), [#10369](https://github.com/angular/angular.js/issues/10369))
+- **$sanitize:** disallow unsafe svg animation tags
+  ([67688d5c](https://github.com/angular/angular.js/commit/67688d5ca00f6de4c7fe6084e2fa762a00d25610),
+   [#11290](https://github.com/angular/angular.js/issues/11290))
+- **Angular:** properly compare RegExp with other objects for equality
+  ([f22e1fc9](https://github.com/angular/angular.js/commit/f22e1fc9610ae111a3ea8746a3a57169c99ce142),
+   [#11204](https://github.com/angular/angular.js/issues/11204), [#11205](https://github.com/angular/angular.js/issues/11205))
+- **date filter:** display localised era for `G` format codes
+  ([2b4dfa9e](https://github.com/angular/angular.js/commit/2b4dfa9e2b63d7ebb78f3b0fd3439d18f932e1cd),
+   [#10503](https://github.com/angular/angular.js/issues/10503), [#11266](https://github.com/angular/angular.js/issues/11266))
+- **filterFilter:**
+  - fix filtering using an object expression when the filter value is undefined
+  ([c62fa6bd](https://github.com/angular/angular.js/commit/c62fa6bd898e1048d4690d41034489dc60ba6ac2),
+   [#10419](https://github.com/angular/angular.js/issues/10419), [#10424](https://github.com/angular/angular.js/issues/10424))
+  - do not throw an error if property is null when comparing objects
+  ([2c4ffd6a](https://github.com/angular/angular.js/commit/2c4ffd6af4eb012c4054fe7c096267bbc5510af0),
+   [#10991](https://github.com/angular/angular.js/issues/10991), [#10992](https://github.com/angular/angular.js/issues/10992), [#11116](https://github.com/angular/angular.js/issues/11116))
+- **form:** allow dynamic form names which initially evaluate to blank
+  ([410f7c68](https://github.com/angular/angular.js/commit/410f7c682633c681be641cd2a321f9e51671d474))
+- **jqLite:** attr should ignore comment, text and attribute nodes
+  ([bb5bf7f8](https://github.com/angular/angular.js/commit/bb5bf7f8162d11610a53428e630b47030bdc38e5))
+- **ng/$locale:** add ERA info in generic locale
+  ([4acb0af2](https://github.com/angular/angular.js/commit/4acb0af24c7fb3705a197ca96adc532de4766a7a))
+- **ngJq:** don't rely on existence of jqlite
+  ([342e5f3c](https://github.com/angular/angular.js/commit/342e5f3ce38d2fd10c5d5a98ca66f864286a7922),
+   [#11044](https://github.com/angular/angular.js/issues/11044))
+- **ngMessages:** ensure that multi-level transclusion works with `ngMessagesInclude`
+  ([d7ec5f39](https://github.com/angular/angular.js/commit/d7ec5f392e1550658ddf271a30627b1749eccb69),
+   [#11196](https://github.com/angular/angular.js/issues/11196))
+- **ngOptions:** fix model<->option interaction when using `track by`
+  ([6a03ca27](https://github.com/angular/angular.js/commit/6a03ca274314352052c3082163367a146bb11c2d),
+   [#10869](https://github.com/angular/angular.js/issues/10869), [#10893](https://github.com/angular/angular.js/issues/10893))
+- **rootScope:** prevent memory leak when destroying scopes
+  ([fb7db4a0](https://github.com/angular/angular.js/commit/fb7db4a07bd1b0b67824d3808fe315419b272689),
+   [#11173](https://github.com/angular/angular.js/issues/11173), [#11169](https://github.com/angular/angular.js/issues/11169))
+
+
+## Features
+
+- **$cookies:**
+  - allow passing cookie options
+  ([92c366d2](https://github.com/angular/angular.js/commit/92c366d205da36ec26502aded23db71a6473dad7),
+   [#8324](https://github.com/angular/angular.js/issues/8324), [#3988](https://github.com/angular/angular.js/issues/3988), [#1786](https://github.com/angular/angular.js/issues/1786), [#950](https://github.com/angular/angular.js/issues/950))
+  - move logic into $cookies and deprecate $cookieStore
+  ([38fbe3ee](https://github.com/angular/angular.js/commit/38fbe3ee8370fc449b82d80df07b5c2ed2cd5fbe),
+   [#6411](https://github.com/angular/angular.js/issues/6411), [#7631](https://github.com/angular/angular.js/issues/7631))
+- **$cookiesProvider:** provide path, domain, expires and secure options
+  ([53c66369](https://github.com/angular/angular.js/commit/53c663699126815eabc2a3bc1e3bafc8b3874268))
+- **$interval:** pass additional arguments to the callback
+  ([4f1f9cfd](https://github.com/angular/angular.js/commit/4f1f9cfdb721cf308ca1162b2227836dc1d28388),
+   [#10632](https://github.com/angular/angular.js/issues/10632))
+- **$timeout:** pass additional arguments to the callback
+  ([3a4b6b83](https://github.com/angular/angular.js/commit/3a4b6b83efdb8051e5c4803c0892c19ceb2cba50),
+   [#10631](https://github.com/angular/angular.js/issues/10631))
+- **angular.merge:** provide an alternative to `angular.extend` that merges 'deeply'
+  ([c0498d45](https://github.com/angular/angular.js/commit/c0498d45feb913c318224ea70b5adf7112df6bac),
+   [#10507](https://github.com/angular/angular.js/issues/10507), [#10519](https://github.com/angular/angular.js/issues/10519))
+- **filterFilter:** compare object with custom `toString()` to primitive
+  ([f8c42161](https://github.com/angular/angular.js/commit/f8c421617096a8d613f4eb6d0f5b098ee149c029),
+   [#10464](https://github.com/angular/angular.js/issues/10464), [#10548](https://github.com/angular/angular.js/issues/10548))
+- **ngAria:**
+  - add `button` role to `ngClick`
+  ([bb365070](https://github.com/angular/angular.js/commit/bb365070a3ed7c2d26056d378ab6a8ef493b23cc),
+   [#9254](https://github.com/angular/angular.js/issues/9254), [#10318](https://github.com/angular/angular.js/issues/10318))
+  - add roles to custom inputs
+  ([29cdaee2](https://github.com/angular/angular.js/commit/29cdaee2b6e853bc3f8882a00661698d146ecd18),
+   [#10012](https://github.com/angular/angular.js/issues/10012), [#10318](https://github.com/angular/angular.js/issues/10318))
+- **ngLocale:** Add FIRSTDAYOFWEEK and WEEKENDRANGE from google data
+  ([3d149c7f](https://github.com/angular/angular.js/commit/3d149c7f20ffabab5a635af9ddcfc7105112ab4a))
+- **ngMock:**
+  - allow mock $controller service to set up controller bindings
+  ([d02d0585](https://github.com/angular/angular.js/commit/d02d0585a086ecd2e1de628218b5a6d85c8fc7bd),
+   [#9425](https://github.com/angular/angular.js/issues/9425), [#11239](https://github.com/angular/angular.js/issues/11239))
+  - add `they` helpers for testing multiple specs
+  ([e650c458](https://github.com/angular/angular.js/commit/e650c45894abe6314a806e6b3e32c908df5c00fd),
+   [#10864](https://github.com/angular/angular.js/issues/10864))
+- **ngModel:** support conversion to timezone other than UTC
+  ([0413bee8](https://github.com/angular/angular.js/commit/0413bee8cc563a6555f8d42d5f183f6fbefc7350),
+   [#11005](https://github.com/angular/angular.js/issues/11005))
+
+
+## Breaking Changes
+
+- **$cookies:** due to [38fbe3ee](https://github.com/angular/angular.js/commit/38fbe3ee8370fc449b82d80df07b5c2ed2cd5fbe),
+
+
+`$cookies` no longer exposes properties that represent the current browser cookie
+values. Now you must explicitly the methods described above to access the cookie
+values. This also means that you can no longer watch the `$cookies` properties for
+changes to the browser's cookies.
+
+This feature is generally only needed if a 3rd party library was programmatically
+changing the cookies at runtime. If you rely on this then you must either write code that
+can react to the 3rd party library making the changes to cookies or implement your own polling
+mechanism.
+
+
+
+
+<a name="1.3.15"></a>
+# 1.3.15 locality-filtration (2015-03-17)
+
+## Bug Fixes
+
+- **$animate:** call `applyStyles` with options on `leave`
+  ([ebd84e80](https://github.com/angular/angular.js/commit/ebd84e8008f45ccaa84290f6da8c2a114fcfa8cd),
+   [#10068](https://github.com/angular/angular.js/issues/10068))
+- **$browser:**  don't crash if history.state access causes error in IE
+  ([92767c09](https://github.com/angular/angular.js/commit/92767c098feaf8c58faf2d67f882305019d8160e),
+   [#10367](https://github.com/angular/angular.js/issues/10367), [#10369](https://github.com/angular/angular.js/issues/10369))
+- **Angular:** properly compare RegExp with other objects for equality
+  ([b8e8f9af](https://github.com/angular/angular.js/commit/b8e8f9af78f4ef3e556dd3cef6bfee35ad4cb82a),
+   [#11204](https://github.com/angular/angular.js/issues/11204), [#11205](https://github.com/angular/angular.js/issues/11205))
+- **date filter:** display localised era for `G` format codes
+  ([f2683f95](https://github.com/angular/angular.js/commit/f2683f956fcd3216eaa263db20b31e0d46338800),
+   [#10503](https://github.com/angular/angular.js/issues/10503), [#11266](https://github.com/angular/angular.js/issues/11266))
+- **filterFilter:**
+  - fix filtering using an object expression when the filter value is `undefined`
+  ([63b9956f](https://github.com/angular/angular.js/commit/63b9956faf4c3679c88a9401b8ccbb111c0294ee),
+   [#10419](https://github.com/angular/angular.js/issues/10419), [#10424](https://github.com/angular/angular.js/issues/10424))
+  - do not throw an error if property is null when comparing objects
+  ([01161a0e](https://github.com/angular/angular.js/commit/01161a0e9fb1af93e9f06535aed8392ed7f116a4),
+   [#10991](https://github.com/angular/angular.js/issues/10991), [#10992](https://github.com/angular/angular.js/issues/10992), [#11116](https://github.com/angular/angular.js/issues/11116))
+- **form:** allow dynamic form names which initially evaluate to blank
+  ([190ea883](https://github.com/angular/angular.js/commit/190ea883c588d63f8b900a8de1d45c6c9ebb01ec),
+   [#11096](https://github.com/angular/angular.js/issues/11096))
+- **ng/$locale:** add ERA info in generic locale
+  ([57842530](https://github.com/angular/angular.js/commit/578425303f2480959da80f31920d08f277d42010))
+- **rootScope:** prevent memory leak when destroying scopes
+  ([528cf09e](https://github.com/angular/angular.js/commit/528cf09e3f78ad4e3bb6a329ebe315c4f29b4cdb),
+   [#11173](https://github.com/angular/angular.js/issues/11173), [#11169](https://github.com/angular/angular.js/issues/11169))
+- **templateRequest:** avoid throwing syntax error in Android 2.3
+  ([75abbd52](https://github.com/angular/angular.js/commit/75abbd525f07866fdcc6fb311802b8fe700af174),
+   [#11089](https://github.com/angular/angular.js/issues/11089), [#11051](https://github.com/angular/angular.js/issues/11051), [#11088](https://github.com/angular/angular.js/issues/11088))
+
+
+## Features
+
+- **ngAria:**
+  - add `button` role to `ngClick`
+  ([b9ad91cf](https://github.com/angular/angular.js/commit/b9ad91cf1e86310a2d2bf13b29fa13a9b835e1ce),
+   [#9254](https://github.com/angular/angular.js/issues/9254), [#10318](https://github.com/angular/angular.js/issues/10318))
+  - add roles to custom inputs
+  ([21369943](https://github.com/angular/angular.js/commit/21369943fafd577b36827a641b021b1c14cefb57),
+   [#10012](https://github.com/angular/angular.js/issues/10012), [#10318](https://github.com/angular/angular.js/issues/10318))
+- **ngMock:**
+  - allow mock $controller service to set up controller bindings
+  ([b3878a36](https://github.com/angular/angular.js/commit/b3878a36d9f8e56ad7be1eedb9691c9bd12568cb),
+   [#9425](https://github.com/angular/angular.js/issues/9425), [#11239](https://github.com/angular/angular.js/issues/11239))
+  - add `they` helpers for testing multiple specs
+  ([7288be25](https://github.com/angular/angular.js/commit/7288be25a75d6ca6ac7eca05a7d6b12ccb3a22f8),
+   [#10864](https://github.com/angular/angular.js/issues/10864))
+
+
+
+<a name="1.4.0-beta.5"></a>
+# 1.4.0-beta.5 karmic-stabilization (2015-02-24)
+
+
+## Bug Fixes
+
+- **$http:** properly access request headers with mixed case
+  ([5da1256f](https://github.com/angular/angular.js/commit/5da1256fc2812d5b28fb0af0de81256054856369),
+   [#10881](https://github.com/angular/angular.js/issues/10881), [#10883](https://github.com/angular/angular.js/issues/10883))
+- **input:** create max and/or min validator regardless of initial value
+  ([c211e7a5](https://github.com/angular/angular.js/commit/c211e7a5ad5f1fb8748125f14912aa8715081925),
+   [#10307](https://github.com/angular/angular.js/issues/10307), [#10327](https://github.com/angular/angular.js/issues/10327))
+- **ngAria:** correctly set "checked" attr for checkboxes and radios
+  ([d6eba217](https://github.com/angular/angular.js/commit/d6eba21733c6e67e90e3a4763d8d41ad89a73a0c),
+   [#10389](https://github.com/angular/angular.js/issues/10389), [#10212](https://github.com/angular/angular.js/issues/10212))
+- **ngModel:** fix issues when parserName is same as validator key
+  ([056a3170](https://github.com/angular/angular.js/commit/056a31700803c0a6014b43cfcc36c5c500cc596e),
+   [#10698](https://github.com/angular/angular.js/issues/10698), [#10850](https://github.com/angular/angular.js/issues/10850), [#11046](https://github.com/angular/angular.js/issues/11046))
+- **ngOptions:** ngModel is optional
+  ([ef894c87](https://github.com/angular/angular.js/commit/ef894c87eaead76d90169113ab6acc9287654ea3))
+- **ngSanitize:** Do not ignore white-listed svg camelCased attributes
+  ([46b80654](https://github.com/angular/angular.js/commit/46b80654cae9105642909cd55f73f7c26d2fbd80),
+   [#10779](https://github.com/angular/angular.js/issues/10779), [#10990](https://github.com/angular/angular.js/issues/10990), [#11124](https://github.com/angular/angular.js/issues/11124))
+- **select:** remove unknown option when model is undefined and empty option is available
+  ([30b48132](https://github.com/angular/angular.js/commit/30b48132e0fb92ea8dd25a9794b4c41a3a81a951),
+   [#11078](https://github.com/angular/angular.js/issues/11078), [#11092](https://github.com/angular/angular.js/issues/11092))
+- **templateRequest:** avoid throwing syntax error in Android 2.3
+  ([f6272333](https://github.com/angular/angular.js/commit/f6272333127d908b19da23f9cd8a74052711795b),
+   [#11089](https://github.com/angular/angular.js/issues/11089), [#11051](https://github.com/angular/angular.js/issues/11051), [#11088](https://github.com/angular/angular.js/issues/11088))
+
+
+## Features
+
+- **CommonJS:** - angular modules are now packaged for npm with helpful exports
+
+- **limitTo:** extend the filter to take a beginning index argument
+  ([aaae3cc4](https://github.com/angular/angular.js/commit/aaae3cc4160417e6dad802ed9d9f6d5471821a87),
+   [#5355](https://github.com/angular/angular.js/issues/5355), [#10899](https://github.com/angular/angular.js/issues/10899))
+- **ngMessages:** provide support for dynamic message resolution
+  ([c9a4421f](https://github.com/angular/angular.js/commit/c9a4421fc3c97448527eadef1f42eb2f487ec2e0),
+   [#10036](https://github.com/angular/angular.js/issues/10036), [#9338](https://github.com/angular/angular.js/issues/9338))
+- **ngOptions:** add support for disabling an option
+  ([da9eac86](https://github.com/angular/angular.js/commit/da9eac8660343b1cd9fdcf9d2d1bda06067142d7),
+   [#638](https://github.com/angular/angular.js/issues/638), [#11017](https://github.com/angular/angular.js/issues/11017))
+
+
+## Performance Improvements
+
+- **$compile:**
+  - replace forEach(controller) with plain loops
+  ([5b522867](https://github.com/angular/angular.js/commit/5b5228675f67c8f5e04c7183c3ef5e71cb2bf08b),
+   [#11084](https://github.com/angular/angular.js/issues/11084))
+  - avoid .data when fetching required controllers
+  ([fa0aa839](https://github.com/angular/angular.js/commit/fa0aa83937378cf8fc720c38bcc5c78fc923624e))
+- **ngOptions:** only watch labels if a display expression is specified
+  ([51faaffd](https://github.com/angular/angular.js/commit/51faaffdbcc734c55d52ff6c42b386d5c90207ea))
+
+
+## Breaking Changes
+
+- **ngMessages:** due to [c9a4421f](https://github.com/angular/angular.js/commit/c9a4421fc3c97448527eadef1f42eb2f487ec2e0),
+
+
+The `ngMessagesInclude` attribute is now its own directive and that must
+be placed as a **child** element within the element with the ngMessages
+directive. (Keep in mind that the former behaviour of the
+ngMessageInclude attribute was that all **included** ngMessage template
+code was placed at the **bottom** of the element containing the
+ngMessages directive; therefore to make this behave in the same way,
+place the element containing the ngMessagesInclude directive at the
+end of the container containing the ngMessages directive).
+
+```html
+<!-- AngularJS 1.3.x -->
+<div ng-messages="model.$error" ng-messages-include="remote.html">
+  <div ng-message="required">Your message is required</div>
+</div>
+
+<!-- AngularJS 1.4.x -->
+<div ng-messages="model.$error">
+  <div ng-message="required">Your message is required</div>
+  <div ng-messages-include="remote.html"></div>
+</div>
+```
+
+- **$http:** due to [5da1256](https://github.com/angular/angular.js/commit/5da1256fc2812d5b28fb0af0de81256054856369),
+
+`transformRequest` functions can no longer modify request headers.
+
+Before this commit `transformRequest` could modify request headers, ex.:
+
+```javascript
+function requestTransform(data, headers) {
+    headers = angular.extend(headers(), {
+      'X-MY_HEADER': 'abcd'
+    });
+  }
+  return angular.toJson(data);
+}
+```
+
+This behavior was unintended and undocumented, so the change should affect very few applications. If one
+needs to dynamically add / remove headers it should be done in a header function, for example:
+
+```javascript
+$http.get(url, {
+  headers: {
+    'X-MY_HEADER': function(config) {
+      return 'abcd'; //you've got access to a request config object to specify header value dynamically
+    }
+  }
+})
+```
+
+<a name="1.3.14"></a>
+# 1.3.14 instantaneous-browserification (2015-02-24)
+
+
+## Features
+
+- **CommonJS:** - angular modules are now packaged for npm with helpful exports
+
+## Bug Fixes
+
+- **input:** create max and/or min validator regardless of initial value
+  ([abfce532](https://github.com/angular/angular.js/commit/abfce5327ce6fd29c33c62d2edf3600674a6b4c0),
+   [#10307](https://github.com/angular/angular.js/issues/10307), [#10327](https://github.com/angular/angular.js/issues/10327))
+- **ngAria:** correctly set "checked" attr for checkboxes and radios
+  ([944c150e](https://github.com/angular/angular.js/commit/944c150e6c3001e51d4bf5e2d8149ae4c565d1e3),
+   [#10389](https://github.com/angular/angular.js/issues/10389), [#10212](https://github.com/angular/angular.js/issues/10212))
+- **ngModel:** fix issues when parserName is same as validator key
+  ([6b7625a0](https://github.com/angular/angular.js/commit/6b7625a09508c4b5355121a9d4206a734b07b2e1),
+   [#10698](https://github.com/angular/angular.js/issues/10698), [#10850](https://github.com/angular/angular.js/issues/10850), [#11046](https://github.com/angular/angular.js/issues/11046))
+
+
+
 <a name="1.4.0-beta.4"></a>
 # 1.4.0-beta.4 overlyexplosive-poprocks (2015-02-09)
 
@@ -402,7 +1352,33 @@ But in practice this is not what people want and so this change iterates over pr
 in the order they are returned by Object.keys(obj), which is almost always the order
 in which the properties were defined.
 
+- **select:** due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
+
+the `select` directive will now use strict comparison of the `ngModel` scope value against `option`
+values to determine which option is selected. This means `Number` scope values will not be matched
+against numeric option strings.
+In Angular 1.3.x, setting `scope.x = 200` would select the `option` with the value 200 in the following `select`:
 
+```
+<select ng-model="x">
+  <option value="100">100</option>
+  <option value="200">200</option>
+</select>
+```
+
+In Angular 1.4.x, the 'unknown option' will be selected.
+To remedy this, you can simply initialize the model as a string: `scope.x = '200'`, or if you want to
+keep the model as a `Number`, you can do the conversion via `$formatters` and `$parsers` on `ngModel`:
+
+```js
+ngModelCtrl.$parsers.push(function(value) {
+  return parseInt(value, 10); // Convert option value to number
+});
+
+ngModelCtrl.$formatters.push(function(value) {
+  return value.toString(); // Convert scope value to string
+});
+```
 
 <a name="1.3.9"></a>
 # 1.3.9 multidimensional-awareness (2015-01-13)
@@ -4362,7 +5338,7 @@ For more info: http://blog.angularjs.org/2013/12/angularjs-13-new-release-approa
   - properly toggle multiple classes
   ([4e73c80b](https://github.com/angular/angular.js/commit/4e73c80b17bd237a8491782bcf9e19f1889e12ed),
    [#4467](https://github.com/angular/angular.js/issues/4467), [#6448](https://github.com/angular/angular.js/issues/6448))
-  - make jqLite('<iframe src="someurl">').contents() return iframe document, as in jQuery
+  - make `jqLite(<iframe src="someurl">').contents()` return iframe document, as in jQuery
   ([05fbed57](https://github.com/angular/angular.js/commit/05fbed5710b702c111c1425a9e241c40d13b0a54),
    [#6320](https://github.com/angular/angular.js/issues/6320), [#6323](https://github.com/angular/angular.js/issues/6323))
 - **numberFilter:** convert all non-finite/non-numbers/non-numeric strings to the empty string
@@ -8738,7 +9714,7 @@ with the `$route` service
   mocks now part of `angular-mocks.js` (commit f5d08963)
 
 ### Bug Fixes
-- <select> (one/multiple) could not chose from a list of objects (commit 347be5ae)
+- `<select>` (one/multiple) could not chose from a list of objects (commit 347be5ae)
 - null and other falsy values should not be rendered in the view (issue #242)
 
 ### Docs
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f26fb9e8ddbe..1fba85c339d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-#Contributing to AngularJS
+# Contributing to AngularJS
 
 We'd love for you to contribute to our source code and to make AngularJS even better than it is
 today! Here are the guidelines we'd like you to follow:
@@ -54,7 +54,7 @@ For large fixes, please build and test the documentation before submitting the P
 accidentally introduced any layout or formatting issues. You should also make sure that your commit message
 is labeled "docs:" and follows the **Git Commit Guidelines** outlined below.
 
-If you're just making a small change, don't worry about filing an issue first. Use the friendly blue "Improve this doc" button at the top right of the doc page to fork the repository in-place and make a quick change on the fly. When naming the commit, it is advised to still label it according to the commit guidelines below, by starting the commit message with **docs** and referencing the filename. Since this is not obvious and some changes are made on the fly, this is not strictly necessary and we will understand if this isn't done the first few times. 
+If you're just making a small change, don't worry about filing an issue first. Use the friendly blue "Improve this doc" button at the top right of the doc page to fork the repository in-place and make a quick change on the fly. When naming the commit, it is advised to still label it according to the commit guidelines below, by starting the commit message with **docs** and referencing the filename. Since this is not obvious and some changes are made on the fly, this is not strictly necessary and we will understand if this isn't done the first few times.
 
 ## <a name="submit"></a> Submission Guidelines
 
@@ -199,8 +199,13 @@ format that includes a **type**, a **scope** and a **subject**:
 <footer>
 ```
 
+The **header** is mandatory and the **scope** of the header is optional.
+
 Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
-to read on github as well as in various git tools.
+to read on GitHub as well as in various git tools.
+
+### Revert
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
 
 ### Type
 Must be one of the following:
@@ -210,7 +215,7 @@ Must be one of the following:
 * **docs**: Documentation only changes
 * **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
   semi-colons, etc)
-* **refactor**: A code change that neither fixes a bug or adds a feature
+* **refactor**: A code change that neither fixes a bug nor adds a feature
 * **perf**: A code change that improves performance
 * **test**: Adding missing tests
 * **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
@@ -227,14 +232,15 @@ The subject contains succinct description of the change:
 * don't capitalize first letter
 * no dot (.) at the end
 
-###Body
-Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes"
+### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
 The body should include the motivation for the change and contrast this with previous behavior.
 
-###Footer
+### Footer
 The footer should contain any information about **Breaking Changes** and is also the place to
 reference GitHub issues that this commit **Closes**.
 
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
 
 A detailed explanation can be found in this [document][commit-message-format].
 
diff --git a/Gruntfile.js b/Gruntfile.js
index 705ed6176509..410ca100825b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,10 +17,6 @@ module.exports = function(grunt) {
   NG_VERSION.cdn = versionInfo.cdnVersion;
   var dist = 'angular-'+ NG_VERSION.full;
 
-  //global beforeEach
-  util.init();
-
-
   //config
   grunt.initConfig({
     NG_VERSION: NG_VERSION,
@@ -119,7 +115,7 @@ module.exports = function(grunt) {
         files: { src: 'test/**/*.js' },
       },
       ng: {
-        files: { src: files['angularSrc'] },
+        files: { src: files['angularSrc'].concat('!src/angular.bind') },
       },
       ngAnimate: {
         files: { src: 'src/ngAnimate/**/*.js' },
@@ -130,6 +126,9 @@ module.exports = function(grunt) {
       ngLocale: {
         files: { src: 'src/ngLocale/**/*.js' },
       },
+      ngMessageFormat: {
+        files: { src: 'src/ngMessageFormat/**/*.js' },
+      },
       ngMessages: {
         files: { src: 'src/ngMessages/**/*.js' },
       },
@@ -159,7 +158,7 @@ module.exports = function(grunt) {
     jscs: {
       src: ['src/**/*.js', 'test/**/*.js'],
       options: {
-        config: ".jscs.json"
+        config: ".jscsrc"
       }
     },
 
@@ -204,6 +203,10 @@ module.exports = function(grunt) {
         dest: 'build/angular-resource.js',
         src: util.wrap(files['angularModules']['ngResource'], 'module')
       },
+      messageformat: {
+        dest: 'build/angular-message-format.js',
+        src: util.wrap(files['angularModules']['ngMessageFormat'], 'module')
+      },
       messages: {
         dest: 'build/angular-messages.js',
         src: util.wrap(files['angularModules']['ngMessages'], 'module')
@@ -236,6 +239,7 @@ module.exports = function(grunt) {
       animate: 'build/angular-animate.js',
       cookies: 'build/angular-cookies.js',
       loader: 'build/angular-loader.js',
+      messageformat: 'build/angular-message-format.js',
       messages: 'build/angular-messages.js',
       touch: 'build/angular-touch.js',
       resource: 'build/angular-resource.js',
@@ -251,8 +255,19 @@ module.exports = function(grunt) {
         'test/**/*.js',
         '!test/ngScenario/DescribeSpec.js',
         '!src/ng/directive/attrs.js', // legitimate xit here
-        '!src/ngScenario/**/*.js'
-      ]
+        '!src/ngScenario/**/*.js',
+        '!test/helpers/privateMocks*.js'
+      ],
+      options: {
+        disallowed: [
+          'iit',
+          'xit',
+          'tthey',
+          'xthey',
+          'ddescribe',
+          'xdescribe'
+        ]
+      }
     },
 
     "merge-conflict": {
@@ -285,6 +300,10 @@ module.exports = function(grunt) {
     },
 
     shell: {
+      "npm-install": {
+        command: path.normalize('scripts/npm/install-dependencies.sh')
+      },
+
       "promises-aplus-tests": {
         options: {
           stdout: false,
@@ -311,6 +330,10 @@ module.exports = function(grunt) {
     }
   });
 
+  // global beforeEach task
+  if (!process.env.TRAVIS) {
+    grunt.task.run('shell:npm-install');
+  }
 
   //alias tasks
   grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor']);
diff --git a/README.closure.md b/README.closure.md
index 8d93f0a28ae1..aa237ef5a508 100644
--- a/README.closure.md
+++ b/README.closure.md
@@ -1,8 +1,8 @@
 Using AngularJS with the Closure Compiler
 =========================================
 
-The Closure Compiler project contains externs definitions for AngularJS
-JavaScript in its `contrib/externs` directory.
+The Closure Compiler project contains definitions for the AngularJS JavaScript
+in its `contrib/externs` directory.
 
 The definitions contain externs for use with the Closure compiler (aka
 JSCompiler). Passing these files to the --externs parameter of a compiler
diff --git a/README.md b/README.md
index 7deb1604bde8..aac26f18c667 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ the browser how to do dependency injection and inversion of control.
 
 Oh yeah and it helps with server-side communication, taming async callbacks with promises and 
 deferreds. It also makes client-side navigation and deeplinking with hashbang urls or HTML5 pushState a
-piece of cake. The best of all: it makes development fun!
+piece of cake. Best of all?? It makes development fun!
 
 * Web site: http://angularjs.org
 * Tutorial: http://docs.angularjs.org/tutorial
diff --git a/TRIAGING.md b/TRIAGING.md
index 8ae46a574334..edb30bb8ef11 100644
--- a/TRIAGING.md
+++ b/TRIAGING.md
@@ -55,7 +55,11 @@ This process based on the idea of minimizing user pain
     * inconvenience - causes ugly/boilerplate code in apps
 1. Label `component: *`
     * In rare cases, it's ok to have multiple components.
-1. Label `PRs plz!` - These issues are good targets for PRs from the open source community. Apply to issues where the problem and solution are well defined in the comments, and it's not too complex.
+1. Label `PRs plz!` - These issues are good targets for PRs from the open source community. In addition to applying this label, you must:
+    * Leave a comment explaining the problem and solution so someone can easily finish it.
+    * Assign the issue to yourself.
+    * Give feedback on PRs addressing this issue.
+    * You are responsible for mentoring contributors helping with this issue.
 1. Label `origin: google` for issues from Google
 1. Assign a milestone:
    * Backlog - triaged fixes and features, should be the default choice
diff --git a/angularFiles.js b/angularFiles.js
index 696bd8e78ec8..006111c00b3c 100755
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -14,13 +14,13 @@ var angularFiles = {
 
     'src/ng/anchorScroll.js',
     'src/ng/animate.js',
-    'src/ng/asyncCallback.js',
     'src/ng/browser.js',
     'src/ng/cacheFactory.js',
     'src/ng/compile.js',
     'src/ng/controller.js',
     'src/ng/document.js',
     'src/ng/exceptionHandler.js',
+    'src/ng/forceReflow.js',
     'src/ng/http.js',
     'src/ng/httpBackend.js',
     'src/ng/interpolate.js',
@@ -40,6 +40,7 @@ var angularFiles = {
     'src/ng/timeout.js',
     'src/ng/urlUtils.js',
     'src/ng/window.js',
+    'src/ng/cookieReader.js',
 
     'src/ng/filter.js',
     'src/ng/filter/filter.js',
@@ -75,7 +76,10 @@ var angularFiles = {
     'src/ng/directive/script.js',
     'src/ng/directive/select.js',
     'src/ng/directive/style.js',
-    'src/ng/directive/validators.js'
+    'src/ng/directive/validators.js',
+    'src/angular.bind',
+    'src/publishExternalApis.js',
+    'src/ngLocale/angular-locale_en-us.js'
   ],
 
   'angularLoader': [
@@ -86,10 +90,29 @@ var angularFiles = {
 
   'angularModules': {
     'ngAnimate': [
-      'src/ngAnimate/animate.js'
+      'src/ngAnimate/shared.js',
+      'src/ngAnimate/body.js',
+      'src/ngAnimate/animateChildrenDirective.js',
+      'src/ngAnimate/animateCss.js',
+      'src/ngAnimate/animateCssDriver.js',
+      'src/ngAnimate/animateJs.js',
+      'src/ngAnimate/animateJsDriver.js',
+      'src/ngAnimate/animateQueue.js',
+      'src/ngAnimate/animateRunner.js',
+      'src/ngAnimate/animation.js',
+      'src/ngAnimate/module.js'
     ],
     'ngCookies': [
-      'src/ngCookies/cookies.js'
+      'src/ngCookies/cookies.js',
+      'src/ngCookies/cookieStore.js',
+      'src/ngCookies/cookieWriter.js'
+    ],
+    'ngMessageFormat': [
+      'src/ngMessageFormat/messageFormatCommon.js',
+      'src/ngMessageFormat/messageFormatSelector.js',
+      'src/ngMessageFormat/messageFormatInterpolationParts.js',
+      'src/ngMessageFormat/messageFormatParser.js',
+      'src/ngMessageFormat/messageFormatService.js'
     ],
     'ngMessages': [
       'src/ngMessages/messages.js'
@@ -159,16 +182,16 @@ var angularFiles = {
     'bower_components/jquery/dist/jquery.js',
     'test/jquery_remove.js',
     '@angularSrc',
-    'src/publishExternalApis.js',
     '@angularSrcModules',
     '@angularScenario',
-    '@angularTest',
+    '@angularTest'
   ],
 
   'karmaExclude': [
     'test/jquery_alias.js',
     'src/angular-bootstrap.js',
-    'src/ngScenario/angular-bootstrap.js'
+    'src/ngScenario/angular-bootstrap.js',
+    'src/angular.bind'
   ],
 
   'karmaScenario': [
@@ -181,6 +204,7 @@ var angularFiles = {
     '@angularSrcModules',
     'src/ngScenario/browserTrigger.js',
     'test/helpers/*.js',
+    'test/ngMessageFormat/*.js',
     'test/ngMock/*.js',
     'test/ngCookies/*.js',
     'test/ngRoute/**/*.js',
@@ -194,21 +218,22 @@ var angularFiles = {
     'bower_components/jquery/dist/jquery.js',
     'test/jquery_alias.js',
     '@angularSrc',
-    'src/publishExternalApis.js',
     '@angularSrcModules',
     '@angularScenario',
-    '@angularTest',
+    '@angularTest'
   ],
 
   'karmaJqueryExclude': [
     'src/angular-bootstrap.js',
     'src/ngScenario/angular-bootstrap.js',
-    'test/jquery_remove.js'
+    'test/jquery_remove.js',
+    'src/angular.bind'
   ]
 };
 
 angularFiles['angularSrcModules'] = [].concat(
   angularFiles['angularModules']['ngAnimate'],
+  angularFiles['angularModules']['ngMessageFormat'],
   angularFiles['angularModules']['ngMessages'],
   angularFiles['angularModules']['ngCookies'],
   angularFiles['angularModules']['ngResource'],
diff --git a/benchmarks/largetable-bp/main.html b/benchmarks/largetable-bp/main.html
index 471a4441dd9e..02270b5f2929 100644
--- a/benchmarks/largetable-bp/main.html
+++ b/benchmarks/largetable-bp/main.html
@@ -20,6 +20,8 @@
       <div>interpolation + fnInvocation: <input type="radio" ng-model="benchmarkType" value="interpolationFn"></div>
       <div>ngBind + filter: <input type="radio" ng-model="benchmarkType" value="ngBindFilter"></div>
       <div>interpolation + filter: <input type="radio" ng-model="benchmarkType" value="interpolationFilter"></div>
+      <div>ngModel (const name): <input type="radio" ng-model="benchmarkType" value="ngModelConstName"></div>
+      <div>ngModel (interp name): <input type="radio" ng-model="benchmarkType" value="ngModelInterpName"></div>
 
       <ng-switch on="benchmarkType">
         <baseline-binding-table ng-switch-when="baselineBinding">
@@ -84,7 +86,21 @@ <h2>interpolation with filter</h2>
             <span ng-repeat="column in row">{{column.i | noop}}:{{column.j | noop}}|</span>
           </div>
         </div>
+        <div ng-switch-when="ngModelConstName">
+          <h2>ngModel (const name)</h2>
+          <div ng-repeat="row in data">
+            <input type="text" ng-model="row.i" name="constName" />
+            <input type="text" ng-model="row.j" />
+          </div>
+        </div>
+        <div ng-switch-when="ngModelInterpName">
+          <h2>ngModel (interp name)</h2>
+          <div ng-repeat="(rowIdx, row) in data">
+            <input type="text" ng-model="row.i" name="input-{{rowIdx}}" />
+            <input type="text" ng-model="row.j" name="input2-{{rowIdx}}" />
+          </div>
+        </div>
       </ng-switch>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/css/angular.css b/css/angular.css
index 81da6c4a111c..a2921a61c9e1 100644
--- a/css/angular.css
+++ b/css/angular.css
@@ -9,3 +9,11 @@
 ng\:form {
   display: block;
 }
+
+.ng-animate-shim {
+  visibility:hidden;
+}
+
+.ng-anchor {
+  position:absolute;
+}
diff --git a/docs/app/assets/css/docs.css b/docs/app/assets/css/docs.css
index 547626db2240..0bd14d669af8 100644
--- a/docs/app/assets/css/docs.css
+++ b/docs/app/assets/css/docs.css
@@ -583,6 +583,12 @@ ul.events > li {
   margin-bottom:40px;
 }
 
+.definition-table td {
+  padding: 8px;
+  border: 1px solid #eee;
+  vertical-align: top;
+}
+
 @media only screen and (min-width: 769px) and (max-width: 991px) {
   .main-body-grid {
     margin-top: 160px;
@@ -695,3 +701,7 @@ ul.events > li {
     padding-bottom:0px;
   }
 }
+
+iframe[name="example-anchoringExample"] {
+  height:400px;
+}
diff --git a/docs/app/src/tutorials.js b/docs/app/src/tutorials.js
index 639b8059e9fc..84ea6171a743 100644
--- a/docs/app/src/tutorials.js
+++ b/docs/app/src/tutorials.js
@@ -35,7 +35,7 @@ angular.module('tutorials', [])
       'step': '@docTutorialReset'
     },
     template:
-      '<p><a href="" ng-click="show=!show;$event.stopPropagation()">Workspace Reset Instructions  ➤</a></p>\n' +
+      '<p><button class="btn" ng-click="show=!show">Workspace Reset Instructions  ➤</button></p>\n' +
       '<div class="alert alert-info" ng-show="show">\n' +
       '  <p>Reset the workspace to step {{step}}.</p>' +
       '  <p><pre>git checkout -f step-{{step}}</pre></p>\n' +
@@ -43,7 +43,7 @@ angular.module('tutorials', [])
           '<a href="http://angular.github.io/angular-phonecat/step-{{step}}/app">Step {{step}} Live Demo</a>.</p>\n' +
       '</div>\n' +
       '<p>The most important changes are listed below. You can see the full diff on ' +
-        '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}">GitHub</a>\n' +
+        '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}" title="See diff on Github">GitHub</a>\n' +
       '</p>'
   };
 });
\ No newline at end of file
diff --git a/docs/app/src/versions.js b/docs/app/src/versions.js
index 708e613d3471..4f299c265bf2 100644
--- a/docs/app/src/versions.js
+++ b/docs/app/src/versions.js
@@ -21,11 +21,13 @@ angular.module('versions', [])
   };
 
   $scope.jumpToDocsVersion = function(version) {
-    var currentPagePath = $location.path().replace(/\/$/, '');
-
-    // TODO: We need to do some munging of the path for different versions of the API...
-
-
-    $window.location = version.docsUrl + currentPagePath;
+    var currentPagePath = $location.path().replace(/\/$/, ''),
+        url = '';
+    if (version.isOldDocsUrl) {
+      url = version.docsUrl;
+    }else{
+      url = version.docsUrl + currentPagePath;
+    }
+    $window.location = url;
   };
 }]);
diff --git a/docs/config/index.js b/docs/config/index.js
index 37c289a29b41..8a1833600790 100644
--- a/docs/config/index.js
+++ b/docs/config/index.js
@@ -6,18 +6,18 @@ var packagePath = __dirname;
 var Package = require('dgeni').Package;
 
 // Create and export a new Dgeni package called angularjs. This package depends upon
-// the ngdoc,nunjucks and examples packages defined in the dgeni-packages npm module.
+// the ngdoc, nunjucks, and examples packages defined in the dgeni-packages npm module.
 module.exports = new Package('angularjs', [
   require('dgeni-packages/ngdoc'),
   require('dgeni-packages/nunjucks'),
-  require('dgeni-packages/examples')
+  require('dgeni-packages/examples'),
+  require('dgeni-packages/git')
 ])
 
 
 .factory(require('./services/errorNamespaceMap'))
 .factory(require('./services/getMinerrInfo'))
 .factory(require('./services/getVersion'))
-.factory(require('./services/gitData'))
 
 .factory(require('./services/deployments/debug'))
 .factory(require('./services/deployments/default'))
@@ -26,7 +26,6 @@ module.exports = new Package('angularjs', [
 
 .factory(require('./inline-tag-defs/type'))
 
-
 .processor(require('./processors/error-docs'))
 .processor(require('./processors/index-page'))
 .processor(require('./processors/keywords'))
@@ -125,10 +124,16 @@ module.exports = new Package('angularjs', [
   });
 
   computeIdsProcessor.idTemplates.push({
-    docTypes: ['error', 'errorNamespace'],
+    docTypes: ['error'],
+    getId: function(doc) { return 'error:' + doc.namespace + ':' + doc.name; },
+    getAliases: function(doc) { return [doc.name, doc.namespace + ':' + doc.name, doc.id]; }
+  },
+  {
+    docTypes: ['errorNamespace'],
     getId: function(doc) { return 'error:' + doc.name; },
     getAliases: function(doc) { return [doc.id]; }
-  });
+  }
+  );
 })
 
 .config(function(checkAnchorLinksProcessor) {
diff --git a/docs/config/services/gitData.js b/docs/config/services/gitData.js
deleted file mode 100644
index bfefa2528768..000000000000
--- a/docs/config/services/gitData.js
+++ /dev/null
@@ -1,16 +0,0 @@
-"use strict";
-
-var versionInfo = require('../../../lib/versions/version-info');
-
-/**
- * @dgService gitData
- * @description
- * Information from the local git repository
- */
-module.exports = function gitData() {
-  return {
-    version: versionInfo.currentVersion,
-    versions: versionInfo.previousVersions,
-    info: versionInfo.gitRepoInfo
-  };
-};
diff --git a/docs/config/templates/error.template.html b/docs/config/templates/error.template.html
index 91593d2f30d9..cd68fb9652b8 100644
--- a/docs/config/templates/error.template.html
+++ b/docs/config/templates/error.template.html
@@ -1,7 +1,7 @@
 {% extends "base.template.html" %}
 
 {% block content %}
-<h1>Error: {$ doc.id $}
+<h1>Error: {$ doc.namespace $}:{$ doc.name $}
   <div><span class='hint'>{$ doc.fullName $}</span></div>
 </h1>
 
diff --git a/docs/config/templates/indexPage.template.html b/docs/config/templates/indexPage.template.html
index b17f1eca50f1..2d8a726e9225 100644
--- a/docs/config/templates/indexPage.template.html
+++ b/docs/config/templates/indexPage.template.html
@@ -3,7 +3,7 @@
 <head>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="Description"
         content="AngularJS is what HTML would have been, had it been designed for building web-apps.
                  Declarative templates with data-binding, MVC, dependency injection and great
@@ -76,7 +76,7 @@
           <div class="row">
             <div class="col-md-9 header-branding">
               <a class="brand navbar-brand" href="http://angularjs.org">
-                <img width="117" height="30" class="logo" ng-src="img/angularjs-for-header-only.svg">
+                <img width="117" height="30" class="logo" alt="Link to Angular JS Homepage" ng-src="img/angularjs-for-header-only.svg">
               </a>
               <ul class="nav navbar-nav">
                 <li class="divider-vertical"></li>
@@ -223,7 +223,7 @@ <h4 class="search-results-group-heading">{{ key }}</h4>
           Super-powered by Google  ©2010-2015
           ( <a id="version"
                ng-href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md#{{versionNumber}}"
-               ng-bind-template="v{{version}}">
+               ng-bind-template="v{{version}}" title="Changelog of this version of Angular JS">
             </a>
           )
         </p>
diff --git a/docs/config/templates/lib/macros.html b/docs/config/templates/lib/macros.html
new file mode 100644
index 000000000000..8fbd577d4008
--- /dev/null
+++ b/docs/config/templates/lib/macros.html
@@ -0,0 +1,60 @@
+{% macro typeList(types) -%}
+{% for typeName in types %}<a href="" class="{$ typeName | typeClass $}">{$ typeName | escape $}</a>{% endfor %}
+{%- endmacro -%}
+
+{%- macro paramTable(params) %}
+<table class="variables-matrix input-arguments">
+  <thead>
+    <tr>
+      <th>Param</th>
+      <th>Type</th>
+      <th>Details</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for param in params %}
+    <tr>
+      <td>
+        {$ param.name $}
+        {% if param.alias %}| {$ param.alias $}{% endif %}
+        {% if param.optional %}<div><em>(optional)</em></div>{% endif %}
+      </td>
+      <td>
+        {$ typeList(param.typeList) $}
+      </td>
+      <td>
+        {$ param.description | marked $}
+        {% if param.defaultValue %}<p><em>(default: {$ param.defaultValue $})</em></p>{% endif %}
+      </td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% endmacro -%}
+
+
+{%- macro directiveParam(name, type, join, sep) %}
+  {%- if type.optional %}[{% endif -%}
+  {$ name | dashCase $}{$ join $}{$ type.name $}{$ sep $}
+  {%- if type.optional %}]{% endif -%}
+{% endmacro -%}
+
+{%- macro functionSyntax(fn) %}
+  {%- set sep = joiner(', ') -%}
+  {% marked -%}
+    `{$ fn.name $}({%- for param in fn.params %}{$ sep() $}
+    {%- if param.type.optional %}[{% endif -%}
+    {$ param.name $}
+    {%- if param.type.optional %}]{% endif -%}
+    {% endfor %});`
+  {%- endmarked %}
+{% endmacro -%}
+
+{%- macro typeInfo(fn) -%}
+<table class="variables-matrix return-arguments">
+  <tr>
+    <td>{$ typeList(fn.typeList) $}</td>
+    <td>{$ fn.description | marked $}</td>
+  </tr>
+</table>
+{%- endmacro -%}
diff --git a/docs/content/api/index.ngdoc b/docs/content/api/index.ngdoc
index f74d35842852..d2a91e06830d 100644
--- a/docs/content/api/index.ngdoc
+++ b/docs/content/api/index.ngdoc
@@ -140,7 +140,7 @@ or JavaScript callbacks.
       {@link ngAnimate#service Services / Factories}
     </td>
     <td>
-      Use {@link ngAnimate.$animate $animate} to trigger animation operations within your directive code.
+      Use {@link ng.$animate $animate} to trigger animation operations within your directive code.
     </td>
   </tr>
   <tr>
diff --git a/docs/content/error/$animate/nocb.ngdoc b/docs/content/error/$animate/nocb.ngdoc
new file mode 100644
index 000000000000..ac5bd360602d
--- /dev/null
+++ b/docs/content/error/$animate/nocb.ngdoc
@@ -0,0 +1,12 @@
+@ngdoc error
+@name $animate:nocb
+@fullName Do not pass a callback to animate methods
+@description
+
+Since Angular 1.3, the methods of {@link ng.$animate} do not accept a callback as the last parameter.
+Instead, they return a promise to which you can attach `then` handlers to be run when the animation completes.
+
+If you are getting this error then you need to update your code to use the promise-based API.
+
+See https://github.com/angular/angular.js/commit/bf0f5502b1bbfddc5cdd2f138efd9188b8c652a9 for information about
+the change to the animation API and the changes you need to make.
diff --git a/docs/content/error/$compile/baddir.ngdoc b/docs/content/error/$compile/baddir.ngdoc
new file mode 100644
index 000000000000..3aef03d1e91b
--- /dev/null
+++ b/docs/content/error/$compile/baddir.ngdoc
@@ -0,0 +1,8 @@
+@ngdoc error
+@name $compile:baddir
+@fullName Invalid Directive Name
+@description
+
+This error occurs when the name of a directive is not valid.
+
+Directives must start with a lowercase character and must not contain leading or trailing whitespaces.
diff --git a/docs/content/error/$compile/nonassign.ngdoc b/docs/content/error/$compile/nonassign.ngdoc
index 0762eea96c39..8a13fd8574bb 100644
--- a/docs/content/error/$compile/nonassign.ngdoc
+++ b/docs/content/error/$compile/nonassign.ngdoc
@@ -36,9 +36,25 @@ Following are invalid uses of this directive:
 ```
 
 
-To resolve this error, always use path expressions with scope properties that are two-way data-bound:
+To resolve this error, do one of the following options:
+
+- use path expressions with scope properties that are two-way data-bound like so:
+
 ```
 <my-directive bind="some.property">
 <my-directive bind="some[3]['property']">
 ```
 
+- Make the binding optional
+
+```
+myModule.directive('myDirective', function factory() {
+  return {
+    ...
+    scope: {
+      localValue: '=?bind' // <-- the '?' makes it optional
+    }
+    ...
+  }
+});
+```
diff --git a/docs/content/error/$controller/ctrlfmt.ngdoc b/docs/content/error/$controller/ctrlfmt.ngdoc
index 019598f7951e..effd9c04ace2 100644
--- a/docs/content/error/$controller/ctrlfmt.ngdoc
+++ b/docs/content/error/$controller/ctrlfmt.ngdoc
@@ -11,7 +11,7 @@ Supported formats:
 1. `__name__`
 2. `__name__ as __identifier__`
 
-N'either `__name__` or `__identifier__` may contain spaces.
+Neither `__name__` or `__identifier__` may contain spaces.
 
 Example of incorrect usage that leads to this error:
 ```html
diff --git a/docs/content/error/$http/legacy.ngdoc b/docs/content/error/$http/legacy.ngdoc
new file mode 100644
index 000000000000..1ff4282fc607
--- /dev/null
+++ b/docs/content/error/$http/legacy.ngdoc
@@ -0,0 +1,45 @@
+@ngdoc error
+@name $http:legacy
+@fullName The `success` and `error` methods on the promise returned from `$http` have been disabled.
+@description
+
+This error occurs when the legacy promise extensions (`success` and `error`)
+{@link $httpProvider#useLegacyPromiseExtensions legacy `$http` promise extensions} have been disabled.
+
+To resolve this error, either turn on the legacy extensions by adding
+`$httpProvider.useLegacyPromiseExtensions(true);` to your application's configuration; or refactor you
+use of `$http` to use `.then()` rather than `.success()` and `.error()`.
+
+For example if you code looked like this:
+
+```js
+// Simple GET request example :
+$http.get('/someUrl').
+   success(function(data, status, headers, config) {
+      // This callback will be called asynchronously
+      // when the response is available
+  }).
+  error(function(data, status, headers, config) {
+    // called asynchronously if an error occurs
+    // or server returns response with an error status.
+  });
+```
+
+then you would change it to look like:
+
+```js
+// Simple GET request example :
+$http.get('/someUrl').
+  then(function(response) {
+    // (The response object contains the data, status, headers and config properties)
+    // This callback will be called asynchronously
+    // when the response is available.
+  }, function(response) {
+    // called asynchronously if an error occurs
+    // or server returns response with an error status.
+  });
+```
+
+For more information, see the
+{@link $httpProvider#useLegacyPromiseExtensions `$httpProvider.useLegacyPromiseExtensions`}
+documentation.
diff --git a/docs/content/error/$injector/unpr.ngdoc b/docs/content/error/$injector/unpr.ngdoc
index 7a0d828f08c9..cbf687b4d77e 100644
--- a/docs/content/error/$injector/unpr.ngdoc
+++ b/docs/content/error/$injector/unpr.ngdoc
@@ -69,3 +69,15 @@ angular.module('myModule', [])
 ```
 
 Use the `$controller` service if you want to instantiate controllers yourself.
+
+Attempting to inject a scope object into anything that's not a controller or a directive,
+for example a service, will also throw an `Unknown provider: $scopeProvider <- $scope` error.
+This might happen if one mistakenly registers a controller as a service, ex.:
+
+```
+angular.module('myModule', [])
+  .service('MyController', ['$scope', function($scope) {
+    // This controller throws an unknown provider error because
+    // a scope object cannot be injected into a service.
+  }]);
+```
diff --git a/docs/content/error/$interpolate/badexpr.ngdoc b/docs/content/error/$interpolate/badexpr.ngdoc
new file mode 100644
index 000000000000..346907c21be2
--- /dev/null
+++ b/docs/content/error/$interpolate/badexpr.ngdoc
@@ -0,0 +1,6 @@
+@ngdoc error
+@name $interpolate:badexpr
+@fullName Expecting end operator
+@description
+
+The Angular expression is missing the corresponding closing operator.
diff --git a/docs/content/error/$interpolate/dupvalue.ngdoc b/docs/content/error/$interpolate/dupvalue.ngdoc
new file mode 100644
index 000000000000..3d72f28e1210
--- /dev/null
+++ b/docs/content/error/$interpolate/dupvalue.ngdoc
@@ -0,0 +1,11 @@
+@ngdoc error
+@name $interpolate:dupvalue
+@fullName Duplicate choice in plural/select
+@description
+
+You have repeated a match selection for your plural or select MessageFormat
+extension in your interpolation expression.  The different choices have to be unique.
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/logicbug.ngdoc b/docs/content/error/$interpolate/logicbug.ngdoc
new file mode 100644
index 000000000000..c660d8d39706
--- /dev/null
+++ b/docs/content/error/$interpolate/logicbug.ngdoc
@@ -0,0 +1,12 @@
+@ngdoc error
+@name $interpolate:logicbug
+@fullName Bug in ngMessageFormat module
+@description
+
+You've just hit a bug in the ngMessageFormat module provided by angular-message-format.min.js.
+Please file a github issue for this and provide the interpolation text that caused you to hit this
+bug mentioning the exact version of AngularJS used and we will fix it!
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/nochgmustache.ngdoc b/docs/content/error/$interpolate/nochgmustache.ngdoc
new file mode 100644
index 000000000000..01652dafef02
--- /dev/null
+++ b/docs/content/error/$interpolate/nochgmustache.ngdoc
@@ -0,0 +1,17 @@
+@ngdoc error
+@name $interpolate:nochgmustache
+@fullName Redefinition of start/endSymbol incompatible with MessageFormat extensions
+@description
+
+You have redefined `$interpolate.startSymbol`/`$interpolate.endSymbol` and also
+loaded the `ngMessageFormat` module (provided by angular-message-format.min.js)
+while creating your injector.
+
+`ngMessageFormat` currently does not support redefinition of the
+startSymbol/endSymbol used by `$interpolate`.  If this is affecting you, please
+file an issue and mention @chirayuk on it.  This is intended to be fixed in a
+future commit and the github issue will help gauge urgency.
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/reqarg.ngdoc b/docs/content/error/$interpolate/reqarg.ngdoc
new file mode 100644
index 000000000000..ee6ff2c8ca92
--- /dev/null
+++ b/docs/content/error/$interpolate/reqarg.ngdoc
@@ -0,0 +1,12 @@
+@ngdoc error
+@name $interpolate:reqarg
+@fullName Missing required argument for MessageFormat
+@description
+
+You must specify the MessageFormat function that you're using right after the
+comma following the Angular expression.  Currently, the supported functions are
+"plural" and "select" (for gender selections.)
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/reqcomma.ngdoc b/docs/content/error/$interpolate/reqcomma.ngdoc
new file mode 100644
index 000000000000..13b137ecc5cd
--- /dev/null
+++ b/docs/content/error/$interpolate/reqcomma.ngdoc
@@ -0,0 +1,11 @@
+@ngdoc error
+@name $interpolate:reqcomma
+@fullName Missing comma following MessageFormat plural/select keyword
+@description
+
+The MessageFormat syntax requires a comma following the "plural" or "select"
+extension keyword in the extended interpolation syntax.
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/reqendbrace.ngdoc b/docs/content/error/$interpolate/reqendbrace.ngdoc
new file mode 100644
index 000000000000..a3e765dd698b
--- /dev/null
+++ b/docs/content/error/$interpolate/reqendbrace.ngdoc
@@ -0,0 +1,11 @@
+@ngdoc error
+@name $interpolate:reqendbrace
+@fullName Unterminated message for plural/select value
+@description
+
+The plural or select message for a value or keyword choice has no matching end
+brace to mark the end of the message.
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/reqendinterp.ngdoc b/docs/content/error/$interpolate/reqendinterp.ngdoc
new file mode 100644
index 000000000000..f5e78441b7ef
--- /dev/null
+++ b/docs/content/error/$interpolate/reqendinterp.ngdoc
@@ -0,0 +1,6 @@
+@ngdoc error
+@name $interpolate:reqendinterp
+@fullName Unterminated interpolation
+@description
+
+The interpolation text does not have an ending `endSymbol` ("}}" by default) and is unterminated.
diff --git a/docs/content/error/$interpolate/reqopenbrace.ngdoc b/docs/content/error/$interpolate/reqopenbrace.ngdoc
new file mode 100644
index 000000000000..6ea091702044
--- /dev/null
+++ b/docs/content/error/$interpolate/reqopenbrace.ngdoc
@@ -0,0 +1,12 @@
+@ngdoc error
+@name $interpolate:reqopenbrace
+@fullName An opening brace was expected but not found
+@description
+
+The plural or select extension keyword or values (such as "other", "male",
+"female", "=0", "one", "many", etc.) MUST be followed by a message enclosed in
+braces.
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/reqother.ngdoc b/docs/content/error/$interpolate/reqother.ngdoc
new file mode 100644
index 000000000000..3ed329f893a7
--- /dev/null
+++ b/docs/content/error/$interpolate/reqother.ngdoc
@@ -0,0 +1,13 @@
+@ngdoc error
+@name $interpolate:reqother
+@fullName Required choice "other" for select/plural in MessageFormat
+@description
+
+Your interpolation expression with a MessageFormat extension for either
+"plural" or "select" (typically used for gender selection) does not contain a
+message for the choice "other".  Using either select or plural MessageFormat
+extensions require that you provide a message for the selection "other".
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/unknarg.ngdoc b/docs/content/error/$interpolate/unknarg.ngdoc
new file mode 100644
index 000000000000..313fec6b32db
--- /dev/null
+++ b/docs/content/error/$interpolate/unknarg.ngdoc
@@ -0,0 +1,12 @@
+@ngdoc error
+@name $interpolate:unknarg
+@fullName Unrecognized MessageFormat extension
+@description
+
+The MessageFormat extensions provided by `ngMessageFormat` are currently
+limited to "plural" and "select".  The extension that you have used is either
+unsupported or invalid.
+
+For more information about the MessageFormat syntax in interpolation
+expressions, please refer to MessageFormat extensions section at
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
diff --git a/docs/content/error/$interpolate/unsafe.ngdoc b/docs/content/error/$interpolate/unsafe.ngdoc
new file mode 100644
index 000000000000..bec99dc6a743
--- /dev/null
+++ b/docs/content/error/$interpolate/unsafe.ngdoc
@@ -0,0 +1,10 @@
+@ngdoc error
+@name $interpolate:unsafe
+@fullName MessageFormat extensions not allowed in secure context
+@description
+
+You have attempted to use a MessageFormat extension in your interpolation expression that is marked as a secure context.  For security purposes, this is not supported.
+
+Read more about secure contexts at {@link ng.$sce Strict Contextual Escaping
+(SCE)} and about the MessageFormat extensions at {@link
+guide/i18n#MessageFormat Angular i18n MessageFormat}.
diff --git a/docs/content/error/$interpolate/untermstr.ngdoc b/docs/content/error/$interpolate/untermstr.ngdoc
new file mode 100644
index 000000000000..4800f46276af
--- /dev/null
+++ b/docs/content/error/$interpolate/untermstr.ngdoc
@@ -0,0 +1,6 @@
+@ngdoc error
+@name $interpolate:untermstr
+@fullName Unterminated string literal
+@description
+
+The string literal was not terminated in your Angular expression.
diff --git a/docs/content/error/$interpolate/wantstring.ngdoc b/docs/content/error/$interpolate/wantstring.ngdoc
new file mode 100644
index 000000000000..757efc87dfd2
--- /dev/null
+++ b/docs/content/error/$interpolate/wantstring.ngdoc
@@ -0,0 +1,8 @@
+@ngdoc error
+@name $interpolate:wantstring
+@fullName Expected the beginning of a string
+@description
+
+We expected to see the beginning of a string (either a single quote or a double
+quote character) in the expression but it was not found.  The expression is
+invalid.  If this is incorrect, please file an issue on github.
diff --git a/docs/content/error/ngModel/numfmt.ngdoc b/docs/content/error/ngModel/numfmt.ngdoc
new file mode 100644
index 000000000000..19e50f522ee3
--- /dev/null
+++ b/docs/content/error/ngModel/numfmt.ngdoc
@@ -0,0 +1,56 @@
+@ngdoc error
+@name ngModel:numfmt
+@fullName Model is not of type `number`
+@description
+
+The number input directive `<input type="number">` requires the model to be a `number`.
+
+If the model is something else, this error will be thrown.
+
+Angular does not set validation errors on the `<input>` in this case
+as this error is caused by incorrect application logic and not by bad input from the user.
+
+If your model does not contain actual numbers then it is up to the application developer
+to use a directive that will do the conversion in the `ngModel` `$formatters` and `$parsers`
+pipeline.
+
+## Example
+
+In this example, our model stores the number as a string, so we provide the `stringToNumber`
+directive to convert it into the format the `input[number]` directive expects.
+
+
+<example module="numfmt-error-module">
+ <file name="index.html">
+  <table>
+    <tr ng-repeat="x in ['0', '1']">
+      <td>
+        <input type="number" string-to-number ng-model="x" /> {{ x }} : {{ typeOf(x) }}
+      </td>
+    </tr>
+  </table>
+ </file>
+ <file name="app.js">
+  angular.module('numfmt-error-module', [])
+
+  .run(function($rootScope) {
+    $rootScope.typeOf = function(value) {
+      return typeof value;
+    };
+  })
+
+  .directive('stringToNumber', function() {
+    return {
+      require: 'ngModel',
+      link: function(scope, element, attrs, ngModel) {
+        ngModel.$parsers.push(function(value) {
+          return '' + value;
+        });
+        ngModel.$formatters.push(function(value) {
+          return parseFloat(value, 10);
+        });
+      }
+    };
+  });
+ </file>
+</example>
\ No newline at end of file
diff --git a/docs/content/error/ngOptions/trkslct.ngdoc b/docs/content/error/ngOptions/trkslct.ngdoc
deleted file mode 100644
index 563ab7ea51b0..000000000000
--- a/docs/content/error/ngOptions/trkslct.ngdoc
+++ /dev/null
@@ -1,33 +0,0 @@
-@ngdoc error
-@name ngOptions:trkslct
-@fullName Comprehension expression cannot contain both `select as` and `track by` expressions.
-@description
-
-NOTE: This error was introduced in 1.3.0-rc.5, and was removed for 1.3.0-rc.6 in order to
-not break existing apps.
-
-This error occurs when 'ngOptions' is passed a comprehension expression that contains both a
-`select as` expression and a `track by` expression. These two expressions are fundamentally
-incompatible.
-
- * Example of bad expression: `<select ng-options="item.subItem as item.label for item in values track by item.id" ng-model="selected">`
-   `values: [{id: 1, label: 'aLabel', subItem: {name: 'aSubItem'}}, {id: 2, label: 'bLabel', subItem: {name: 'bSubItem'}}]`,
-   `$scope.selected = {name: 'aSubItem'};`
- * track by is always applied to `value`, with purpose to preserve the selection,
-   (to `item` in this case)
- * To calculate whether an item is selected, `ngOptions` does the following:
-   1. apply `track by` to the values in the array:
-      In the example: [1,2]
-   2. apply `track by` to the already selected value in `ngModel`:
-      In the example: this is not possible, as `track by` refers to `item.id`, but the selected
-      value from `ngModel` is `{name: aSubItem}`.
-
-Here's an example of how to make this example work by using `track by` without `select as`:
-
-```
-<select ng-model="selected" ng-options="item.label for item in values track by item.id">
-```
-
-Note: This would store the whole `item` as the model to `scope.selected` instead of `item.subItem`.
-
-For more information on valid expression syntax, see 'ngOptions' in {@link ng.directive:select select} directive docs.
diff --git a/docs/content/guide/$location.ngdoc b/docs/content/guide/$location.ngdoc
index 9d996ba90ee8..114c07917ab6 100644
--- a/docs/content/guide/$location.ngdoc
+++ b/docs/content/guide/$location.ngdoc
@@ -693,7 +693,7 @@ A path should always begin with forward slash (`/`); the `$location.path()` sett
 forward slash if it is missing.
 
 Note that the `!` prefix in the hashbang mode is not part of `$location.path()`; it is actually
-hashPrefix.
+`hashPrefix`.
 
 ## Crawling your app
 
diff --git a/docs/content/guide/accessibility.ngdoc b/docs/content/guide/accessibility.ngdoc
index 0865c6e0cfdc..b37c3e1caf25 100644
--- a/docs/content/guide/accessibility.ngdoc
+++ b/docs/content/guide/accessibility.ngdoc
@@ -43,7 +43,7 @@ Currently, ngAria interfaces with the following directives:
 
 Most of ngAria's heavy lifting happens in the {@link ngModel ngModel}
 directive.  For elements using ngModel, special attention is paid by ngAria if that element also
-has a a role or type of `checkbox`, `radio`, `range` or `textbox`.
+has a role or type of `checkbox`, `radio`, `range` or `textbox`.
 
 For those elements using ngModel, ngAria will dynamically bind and update the following ARIA
 attributes (if they have not been explicitly specified by the developer):
@@ -213,11 +213,13 @@ The default CSS for `ngHide`, the inverse method to `ngShow`, makes ngAria redun
 If `ng-click` or `ng-dblclick` is encountered, ngAria will add `tabindex="0"` if it isn't there
 already.
 
-For `ng-click`, keypress will also be bound to `div` and `li` elements. You can turn this
-functionality on or off with the `bindKeypress` configuration option.
+To fix widespread accessibility problems with `ng-click` on div elements, ngAria will dynamically
+bind keypress by default as long as the element isn't an anchor, button, input or textarea.
+You can turn this functionality on or off with the `bindKeypress` configuration option. ngAria
+will also add the `button` role to communicate to users of assistive technologies.
 
-For `ng-dblclick`, you must manually add `ng-keypress` to non-interactive elements such as `div`
-or `taco-button` to enable keyboard access.
+For `ng-dblclick`, you must still manually add `ng-keypress` and role to non-interactive elements such
+as `div` or `taco-button` to enable keyboard access.
 
 <h3>Example</h3>
 ```html
@@ -233,7 +235,7 @@ Becomes:
 
 The new ngMessages module makes it easy to display form validation or other messages with priority
 sequencing and animation. To expose these visual messages to screen readers,
-ngAria injects `aria-live="polite"`, causing them to be read aloud any time a message is shown,
+ngAria injects `aria-live="assertive"`, causing them to be read aloud any time a message is shown,
 regardless of the user's focus location.
 ###Example
 
@@ -247,7 +249,7 @@ regardless of the user's focus location.
 Becomes:
 
 ```html
-<div ng-messages="myForm.myName.$error" aria-live="polite">
+<div ng-messages="myForm.myName.$error" aria-live="assertive">
   <div ng-message="required">You did not enter a field</div>
   <div ng-message="maxlength">Your field is too long</div>
 </div>
diff --git a/docs/content/guide/animations.ngdoc b/docs/content/guide/animations.ngdoc
index 345772578649..14b62f1f9d1b 100644
--- a/docs/content/guide/animations.ngdoc
+++ b/docs/content/guide/animations.ngdoc
@@ -236,7 +236,7 @@ The example below shows how to perform animations during class changes:
  </file>
 </example>
 
-Although the CSS is a little different then what we saw before, the idea is the same.
+Although the CSS is a little different than what we saw before, the idea is the same.
 
 ## Which directives support animations?
 
@@ -253,7 +253,7 @@ The table below explains in detail which animation events are triggered
 | {@link ng.directive:ngClass#animations ngClass or &#123;&#123;class&#125;&#125;}    | add and remove                           |
 | {@link ng.directive:ngShow#animations ngShow & ngHide}                              | add and remove (the ng-hide class value) |
 
-For a full breakdown of the steps involved during each animation event, refer to the {@link ngAnimate.$animate API docs}.
+For a full breakdown of the steps involved during each animation event, refer to the {@link ng.$animate API docs}.
 
 ## How do I use animations in my own directives?
 
@@ -276,6 +276,6 @@ myModule.directive('my-directive', ['$animate', function($animate) {
 
 ## More about animations
 
-For a full breakdown of each method available on `$animate`, see the {@link ngAnimate.$animate API documentation}.
+For a full breakdown of each method available on `$animate`, see the {@link ng.$animate API documentation}.
 
 To see a complete demo, see the {@link tutorial/step_12 animation step within the AngularJS phonecat tutorial}.
diff --git a/docs/content/guide/concepts.ngdoc b/docs/content/guide/concepts.ngdoc
index c7e8af5abe82..afe85f8e4c22 100644
--- a/docs/content/guide/concepts.ngdoc
+++ b/docs/content/guide/concepts.ngdoc
@@ -55,11 +55,11 @@ Try out the Live Preview above, and then let's walk through the example and desc
 <img class="pull-right" style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-databinding1.png">
 
 This looks like normal HTML, with some new markup. In Angular, a file like this is called a
-<a name="template">"{@link templates template}"</a>. When Angular starts your application, it parses and
-processes this new markup from the template using the so-called <a name="compiler">"{@link compiler compiler}"</a>.
-The loaded, transformed and rendered DOM is then called the <a name="view">"view"</a>.
+<a name="template">{@link templates template}</a>. When Angular starts your application, it parses and
+processes this new markup from the template using the <a name="compiler">{@link compiler compiler}</a>.
+The loaded, transformed and rendered DOM is then called the <a name="view"></a>*view*.
 
-The first kind of new markup are the so-called <a name="directive">"{@link directive directives}"</a>.
+The first kind of new markup are the <a name="directive">{@link directive directives}</a>.
 They apply special behavior to attributes or elements in the HTML. In the example above we use the
 {@link ng.directive:ngApp `ng-app`} attribute, which is linked to a directive that automatically
 initializes our application. Angular also defines a directive for the {@link ng.directive:input `input`}
@@ -75,16 +75,16 @@ stores/updates the value of the input field into/from a variable.
 
 The second kind of new markup are the double curly braces `{{ expression | filter }}`:
 When the compiler encounters this markup, it will replace it with the evaluated value of the markup.
-An <a name="expression">"{@link expression expression}"</a> in a template is a JavaScript-like code snippet that allows
+An <a name="expression">{@link expression expression}</a> in a template is a JavaScript-like code snippet that allows
 to read and write variables. Note that those variables are not global variables.
 Just like variables in a JavaScript function live in a scope,
-Angular provides a <a name="scope">"{@link scope scope}"</a> for the variables accessible to expressions.
-The values that are stored in variables on the scope are referred to as the <a name="model">"model"</a>
+Angular provides a <a name="scope">{@link scope scope}</a> for the variables accessible to expressions.
+The values that are stored in variables on the scope are referred to as the <a name="model"></a>*model*
 in the rest of the documentation.
 Applied to the example above, the markup directs Angular to "take the data we got from the input widgets
 and multiply them together".
 
-The example above also contains a <a name="filter">"{@link guide/filter filter}"</a>.
+The example above also contains a <a name="filter">{@link guide/filter filter}</a>.
 A filter formats the value of an expression for display to the user.
 In the example above, the filter {@link ng.filter:currency `currency`} formats a number
 into an output that looks like money.
@@ -92,7 +92,7 @@ into an output that looks like money.
 The important thing in the example is that Angular provides _live_ bindings:
 Whenever the input values change, the value of the expressions are automatically
 recalculated and the DOM is updated with their values.
-The concept behind this is <a name="databinding">"{@link databinding two-way data binding}"</a>.
+The concept behind this is <a name="databinding">{@link databinding two-way data binding}</a>.
 
 
 ## Adding UI logic: Controllers
@@ -150,7 +150,7 @@ different currencies and also pay the invoice.
 
 What changed?
 
-First, there is a new JavaScript file that contains a so-called <a name="controller">"{@link controller controller}"</a>.
+First, there is a new JavaScript file that contains a <a name="controller">{@link controller controller}</a>.
 More exactly, the file contains a constructor function that creates the actual controller instance.
 The purpose of controllers is to expose variables and functionality to expressions and directives.
 
@@ -179,11 +179,11 @@ The following graphic shows how everything works together after we introduced th
 
 <img style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-databinding2.png">
 
-## View independent business logic: Services
+## View-independent business logic: Services
 
 Right now, the `InvoiceController` contains all logic of our example. When the application grows it
-is a good practice to move view independent logic from the controller into a so called
-<a name="service">"{@link services service}"</a>, so it can be reused by other parts
+is a good practice to move view-independent logic from the controller into a
+<a name="service">{@link services service}</a>, so it can be reused by other parts
 of the application as well. Later on, we could also change that service to load the exchange rates
 from the web, e.g. by calling the Yahoo Finance API, without changing the controller.
 
@@ -255,15 +255,15 @@ We moved the `convertCurrency` function and the definition of the existing curre
 into the new file `finance2.js`. But how does the controller
 get a hold of the now separated function?
 
-This is where <a name="di">"{@link di Dependency Injection}"</a> comes into play.
+This is where <a name="di">{@link di Dependency Injection}</a> comes into play.
 Dependency Injection (DI) is a software design pattern that
 deals with how objects and functions get created and how they get a hold of their dependencies.
 Everything within Angular (directives, filters, controllers,
 services, ...) is created and wired using dependency injection. Within Angular,
-the DI container is called the <a name="injector">"{@link di injector}"</a>.
+the DI container is called the <a name="injector">{@link di injector}</a>.
 
 To use DI, there needs to be a place where all the things that should work together are registered.
-In Angular, this is the purpose of the so-called <a name="module">"{@link module modules}"</a>.
+In Angular, this is the purpose of the <a name="module">{@link module modules}</a>.
 When Angular starts, it will use the configuration of the module with the name defined by the `ng-app` directive,
 including the configuration of all modules that this module depends on.
 
diff --git a/docs/content/guide/controller.ngdoc b/docs/content/guide/controller.ngdoc
index 6656b54012bd..c307555153bf 100644
--- a/docs/content/guide/controller.ngdoc
+++ b/docs/content/guide/controller.ngdoc
@@ -5,13 +5,16 @@
 
 # Understanding Controllers
 
-In Angular, a Controller is a JavaScript **constructor function** that is used to augment the
+In Angular, a Controller is defined by a JavaScript **constructor function** that is used to augment the
 {@link scope Angular Scope}.
 
 When a Controller is attached to the DOM via the {@link ng.directive:ngController ng-controller}
 directive, Angular will instantiate a new Controller object, using the specified Controller's
-**constructor function**. A new **child scope** will be available as an injectable parameter to the
-Controller's constructor function as `$scope`.
+**constructor function**. A new **child scope** will be created and made available as an injectable
+parameter to the Controller's constructor function as `$scope`.
+
+If the controller has been attached using the `controller as` syntax then the controller instance will
+be assigned to a property on the new scope.
 
 Use controllers to:
 
@@ -30,12 +33,12 @@ Do not use controllers to:
 services} instead.
 - Manage the life-cycle of other components (for example, to create service instances).
 
-# Setting up the initial state of a `$scope` object
+## Setting up the initial state of a `$scope` object
 
 Typically, when you create an application you need to set up the initial state for the Angular
 `$scope`. You set up the initial state of a scope by attaching properties to the `$scope` object.
 The properties contain the **view model** (the model that will be presented by the view).  All the
-`$scope` properties will be available to the template at the point in the DOM where the Controller
+`$scope` properties will be available to the {@link templates template} at the point in the DOM where the Controller
 is registered.
 
 The following example demonstrates creating a `GreetingController`, which attaches a `greeting`
@@ -69,13 +72,13 @@ now be data-bound to the template:
 ```
 
 
-# Adding Behavior to a Scope Object
+## Adding Behavior to a Scope Object
 
 In order to react to events or execute computation in the view we must provide behavior to the
 scope. We add behavior to the scope by attaching methods to the `$scope` object.  These methods are
 then available to be called from the template/view.
 
-The following example uses a Controller to add a method to the scope, which doubles a number:
+The following example uses a Controller to add a method, which doubles a number, to the scope:
 
 ```js
 var myApp = angular.module('myApp',[]);
@@ -99,14 +102,14 @@ objects (or primitives) assigned to the scope become model properties. Any metho
 the scope are available in the template/view, and can be invoked via angular expressions
 and `ng` event handler directives (e.g. {@link ng.directive:ngClick ngClick}).
 
-# Using Controllers Correctly
+## Using Controllers Correctly
 
 In general, a Controller shouldn't try to do too much. It should contain only the business logic
 needed for a single view.
 
 The most common way to keep Controllers slim is by encapsulating work that doesn't belong to
 controllers into services and then using these services in Controllers via dependency injection.
-This is discussed in the {@link di Dependency Injection} {@link services
+This is discussed in the {@link di Dependency Injection}  and  {@link services
 Services} sections of this guide.
 
 
@@ -125,7 +128,7 @@ following components:
 - A model consisting of a string named `spice`
 - A Controller with two functions that set the value of `spice`
 
-The message in our template contains a binding to the `spice` model, which by default is set to the
+The message in our template contains a binding to the `spice` model which, by default, is set to the
 string "very". Depending on which button is clicked, the `spice` model is set to `chili` or
 `jalapeño`, and the message is automatically updated by data-binding.
 
@@ -162,7 +165,7 @@ scope is augmented (managed) by the `SpicyController` Controller.
 starts with capital letter and ends with "Controller".
 - Assigning a property to `$scope` creates or updates the model.
 - Controller methods can be created through direct assignment to scope (see the `chiliSpicy` method)
-- The Controller methods and properties are available in the template (for the `<div>` element and
+- The Controller methods and properties are available in the template (for both the `<div>` element and
 its children).
 
 ## Spicy Arguments Example
@@ -259,7 +262,7 @@ Inheritance works with methods in the same way as it does with properties. So in
 examples, all of the properties could be replaced with methods that return string values.
 
 
-## Testing Controllers
+# Testing Controllers
 
 Although there are many ways to test a Controller, one of the best conventions, shown below,
 involves injecting the {@link ng.$rootScope $rootScope} and {@link ng.$controller $controller}:
@@ -302,7 +305,7 @@ describe('myController function', function() {
 ```
 
 
-If you need to test a nested Controller you need to create the same scope hierarchy
+If you need to test a nested Controller you  must create the same scope hierarchy
 in your test that exists in the DOM:
 
 ```js
diff --git a/docs/content/guide/databinding.ngdoc b/docs/content/guide/databinding.ngdoc
index cf03f7aac798..f435c1b3cd02 100644
--- a/docs/content/guide/databinding.ngdoc
+++ b/docs/content/guide/databinding.ngdoc
@@ -3,6 +3,8 @@
 @sortOrder 210
 @description
 
+# Data Binding
+
 Data-binding in Angular apps is the automatic synchronization of data between the model and view
 components.  The way that Angular implements data-binding lets you treat the model as the
 single-source-of-truth in your application.  The view is a projection of the model at all times.
diff --git a/docs/content/guide/di.ngdoc b/docs/content/guide/di.ngdoc
index c030ca32c801..0701ef6d1fc8 100644
--- a/docs/content/guide/di.ngdoc
+++ b/docs/content/guide/di.ngdoc
@@ -163,8 +163,8 @@ someModule.controller('MyController', function($scope, greeter) {
 });
 ```
 
-Given a function the injector can infer the names of the services to inject by examining the
-function declaration and extracting the parameter names. In the above example `$scope`, and
+Given a function, the injector can infer the names of the services to inject by examining the
+function declaration and extracting the parameter names. In the above example, `$scope` and
 `greeter` are two services which need to be injected into the function.
 
 One advantage of this approach is that there's no array of names to keep in sync with the
@@ -293,7 +293,7 @@ Create a new injector that can provide components defined in our `myModule` modu
 `greeter` service from the injector. (This is usually done automatically by angular bootstrap).
 
 ```js
-var injector = angular.injector(['myModule', 'ng']);
+var injector = angular.injector(['ng', 'myModule']);
 var greeter = injector.get('greeter');
 ```
 
diff --git a/docs/content/guide/directive.ngdoc b/docs/content/guide/directive.ngdoc
index 77c558aaca9e..b5939f320f03 100644
--- a/docs/content/guide/directive.ngdoc
+++ b/docs/content/guide/directive.ngdoc
@@ -51,9 +51,11 @@ In the following example, we say that the `<input>` element **matches** the `ngM
 The following also **matches** `ngModel`:
 
 ```html
-<input data-ng:model="foo">
+<input data-ng-model="foo">
 ```
 
+### Normalization
+
 Angular **normalizes** an element's tag and attribute name to determine which elements match which
 directives. We typically refer to directives by their case-sensitive
 [camelCase](http://en.wikipedia.org/wiki/CamelCase) **normalized** name (e.g. `ngModel`).
@@ -100,6 +102,8 @@ If you want to use an HTML validating tool, you can instead use the `data`-prefi
 The other forms shown above are accepted for legacy reasons but we advise you to avoid them.
 </div>
 
+### Directive types
+
 `$compile` can match directives based on element names, attributes, class names, as well as comments.
 
 All of the Angular-provided directives match attribute name, tag name, comments, or class name.
@@ -827,37 +831,39 @@ element?
   <file name="script.js">
     angular.module('dragModule', [])
       .directive('myDraggable', ['$document', function($document) {
-        return function(scope, element, attr) {
-          var startX = 0, startY = 0, x = 0, y = 0;
-
-          element.css({
-           position: 'relative',
-           border: '1px solid red',
-           backgroundColor: 'lightgrey',
-           cursor: 'pointer'
-          });
-
-          element.on('mousedown', function(event) {
-            // Prevent default dragging of selected content
-            event.preventDefault();
-            startX = event.pageX - x;
-            startY = event.pageY - y;
-            $document.on('mousemove', mousemove);
-            $document.on('mouseup', mouseup);
-          });
+        return {
+          link: function(scope, element, attr) {
+            var startX = 0, startY = 0, x = 0, y = 0;
 
-          function mousemove(event) {
-            y = event.pageY - startY;
-            x = event.pageX - startX;
             element.css({
-              top: y + 'px',
-              left:  x + 'px'
+             position: 'relative',
+             border: '1px solid red',
+             backgroundColor: 'lightgrey',
+             cursor: 'pointer'
             });
-          }
 
-          function mouseup() {
-            $document.off('mousemove', mousemove);
-            $document.off('mouseup', mouseup);
+            element.on('mousedown', function(event) {
+              // Prevent default dragging of selected content
+              event.preventDefault();
+              startX = event.pageX - x;
+              startY = event.pageY - y;
+              $document.on('mousemove', mousemove);
+              $document.on('mouseup', mouseup);
+            });
+
+            function mousemove(event) {
+              y = event.pageY - startY;
+              x = event.pageX - startX;
+              element.css({
+                top: y + 'px',
+                left:  x + 'px'
+              });
+            }
+
+            function mouseup() {
+              $document.off('mousemove', mousemove);
+              $document.off('mouseup', mouseup);
+            }
           }
         };
       }]);
diff --git a/docs/content/guide/expression.ngdoc b/docs/content/guide/expression.ngdoc
index 1890c16102e3..b5d0d4c7a9f5 100644
--- a/docs/content/guide/expression.ngdoc
+++ b/docs/content/guide/expression.ngdoc
@@ -28,13 +28,13 @@ Angular expressions are like JavaScript expressions with the following differenc
 
   * **No Control Flow Statements:** You cannot use the following in an Angular expression:
     conditionals, loops, or exceptions.
-	
+
   * **No Function Declarations:** You cannot declare functions in an Angular expression,
     even inside `ng-init` directive.
-	
-  * **No RegExp Creation With Literal Notation:** You cannot create regular expressions 
+
+  * **No RegExp Creation With Literal Notation:** You cannot create regular expressions
     in an Angular expression.
-	
+
   * **No Comma And Void Operators:** You cannot use `,` or `void` in an Angular expression.
 
   * **Filters:** You can use {@link guide/filter filters} within expressions to format data before
@@ -70,7 +70,7 @@ You can try evaluating different expressions here:
       <ul>
        <li ng-repeat="expr in exprs track by $index">
          [ <a href="" ng-click="removeExp($index)">X</a> ]
-         <tt>{{expr}}</tt> => <span ng-bind="$parent.$eval(expr)"></span>
+         <code>{{expr}}</code> => <span ng-bind="$parent.$eval(expr)"></span>
         </li>
       </ul>
     </div>
@@ -141,6 +141,9 @@ provide mockable access to globals.
       }
       element(by.css('[ng-click="greet()"]')).click();
 
+      // We need to give the browser time to display the alert
+      browser.wait(protractor.ExpectedConditions.alertIsPresent(), 1000);
+
       var alertDialog = browser.switchTo().alert();
 
       expect(alertDialog.getText()).toEqual('Hello World');
@@ -175,7 +178,7 @@ expression, delegate to a JavaScript method instead.
 ## No function declarations or RegExp creation with literal notation
 
 You can't declare functions or create regular expressions from within AngularJS expressions. This is
-to avoid complex model transformation logic inside templates. Such logic is better placed in a 
+to avoid complex model transformation logic inside templates. Such logic is better placed in a
 controller or in a dedicated filter where it can be tested properly.
 
 ## `$event`
@@ -297,25 +300,29 @@ then the expression is not fulfilled and will remain watched.
   2. If V is not undefined, mark the result of the expression as stable and schedule a task
      to deregister the watch for this expression when we exit the digest loop
   3. Process the digest loop as normal
-  4. When digest loop is done and all the values have settled process the queue of watch
-     deregistration tasks. For each watch to be deregistered check if it still evaluates
-     to value that is not `undefined`. If that's the case, deregister the watch. Otherwise
+  4. When digest loop is done and all the values have settled, process the queue of watch
+     deregistration tasks. For each watch to be deregistered, check if it still evaluates
+     to a value that is not `undefined`. If that's the case, deregister the watch. Otherwise,
      keep dirty-checking the watch in the future digest loops by following the same
      algorithm starting from step 1
 
+#### Special case for object literals
+
+Unlike simple values, object-literals are watched until every key is defined.
+See http://www.bennadel.com/blog/2760-one-time-data-bindings-for-object-literal-expressions-in-angularjs-1-3.htm
 
 ### How to benefit from one-time binding
 
-If the expression will not change once set, it is a candidate for one-time binding. 
+If the expression will not change once set, it is a candidate for one-time binding.
 Here are three example cases.
 
 When interpolating text or attributes:
 
 ```html
-  <div name="attr: {{::color}}">text: {{::name}}</div>
+  <div name="attr: {{::color}}">text: {{::name | uppercase}}</div>
 ```
 
-When using a directive with bidirectional binding and the parameters will not change:
+When using a directive with bidirectional binding and parameters that will not change:
 
 ```js
 someModule.directive('someDirective', function() {
@@ -338,7 +345,6 @@ When using a directive that takes an expression:
 
 ```html
 <ul>
-  <li ng-repeat="item in ::items">{{item.name}};</li>
+  <li ng-repeat="item in ::items | orderBy:'name'">{{item.name}};</li>
 </ul>
 ```
-
diff --git a/docs/content/guide/filter.ngdoc b/docs/content/guide/filter.ngdoc
index 22eb4a5f163d..6830cfdea459 100644
--- a/docs/content/guide/filter.ngdoc
+++ b/docs/content/guide/filter.ngdoc
@@ -92,8 +92,10 @@ means that it should be stateless and idempotent. Angular relies on these proper
 the filter only when the inputs to the function change.
 
 <div class="alert alert-warning">
-**Note:** filter names must be valid angular expression identifiers, such as `uppercase` or `orderBy`.
-Names with special characters, such as hyphens and dots, are not allowed.
+**Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+Names with special characters, such as hyphens and dots, are not allowed.  If you wish to namespace
+your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+(`myapp_subsection_filterx`).
 </div>
 
 The following sample filter reverses a text string. In addition, it conditionally makes the
diff --git a/docs/content/guide/forms.ngdoc b/docs/content/guide/forms.ngdoc
index e691872c118e..dd51af985190 100644
--- a/docs/content/guide/forms.ngdoc
+++ b/docs/content/guide/forms.ngdoc
@@ -3,6 +3,8 @@
 @sortOrder 290
 @description
 
+# Forms
+
 Controls (`input`, `select`, `textarea`) are ways for a user to enter data.
 A Form is a collection of controls for the purpose of grouping related controls together.
 
@@ -14,7 +16,7 @@ be circumvented and thus can not be trusted. Server-side validation is still nec
 secure application.
 
 
-# Simple form
+## Simple form
 The key directive in understanding two-way data-binding is {@link ng.directive:ngModel ngModel}.
 The `ngModel` directive provides the two-way data-binding by synchronizing the model to the view,
 as well as view to the model. In addition it provides an {@link ngModel.NgModelController API}
@@ -62,7 +64,7 @@ For example: inputs of type `email` must have a value in the form of `user@domai
 
 
 
-# Using CSS classes
+## Using CSS classes
 
 To allow styling of form as well as controls, `ngModel`  adds these CSS classes:
 
@@ -93,6 +95,8 @@ and failing to satisfy its validity.
         <input type="button" ng-click="reset()" value="Reset" />
         <input type="submit" ng-click="update(user)" value="Save" />
       </form>
+      <pre>form = {{user | json}}</pre>
+      <pre>master = {{master | json}}</pre>
     </div>
 
     <style type="text/css">
@@ -126,7 +130,7 @@ and failing to satisfy its validity.
 
 
 
-# Binding to form and control state
+## Binding to form and control state
 
 A form is an instance of {@link form.FormController FormController}.
 The form instance can optionally be published into the scope using the `name` attribute.
@@ -181,6 +185,8 @@ didn't interact with a control
         <input type="button" ng-click="reset(form)" value="Reset" />
         <input type="submit" ng-click="update(user)" value="Save" />
       </form>
+      <pre>form = {{user | json}}</pre>
+      <pre>master = {{master | json}}</pre>
     </div>
   </file>
 
@@ -208,7 +214,7 @@ didn't interact with a control
 
 
 
-# Custom model update triggers
+## Custom model update triggers
 
 By default, any change to the content will trigger a model update and form validation. You can
 override this behavior using the {@link ng.directive:ngModelOptions ngModelOptions} directive to
@@ -249,7 +255,7 @@ will update the model only when the control loses focus (blur event).
 
 
 
-# Non-immediate (debounced) model updates
+## Non-immediate (debounced) model updates
 
 You can delay the model update/validation by using the `debounce` key with the
 {@link ng.directive:ngModelOptions ngModelOptions} directive. This delay will also apply to
@@ -290,7 +296,7 @@ after last change.
   </file>
 </example>
 
-# Custom Validation
+## Custom Validation
 
 Angular provides basic implementation for most common HTML5 {@link ng.directive:input input}
 types: ({@link input[text] text}, {@link input[number] number}, {@link input[url] url},
@@ -407,7 +413,7 @@ In the following example we create two directives:
   </file>
 </example>
 
-# Modifying built-in validators
+## Modifying built-in validators
 
 Since Angular itself uses `$validators`, you can easily replace or remove built-in validators,
 should you find it necessary. The following example shows you how to overwrite the email validator
@@ -452,7 +458,7 @@ Note that you can alternatively use `ng-pattern` to further restrict the validat
 </example>
 
 
-# Implementing custom form controls (using `ngModel`)
+## Implementing custom form controls (using `ngModel`)
 Angular implements all of the basic HTML form controls ({@link ng.directive:input input},
 {@link ng.directive:select select}, {@link ng.directive:textarea textarea}),
 which should be sufficient for most cases. However, if you need more flexibility,
@@ -489,9 +495,7 @@ The following example shows how to add two-way data-binding to contentEditable e
         link: function(scope, elm, attrs, ctrl) {
           // view -> model
           elm.on('blur', function() {
-            scope.$apply(function() {
-              ctrl.$setViewValue(elm.html());
-            });
+            ctrl.$setViewValue(elm.html());
           });
 
           // model -> view
diff --git a/docs/content/guide/i18n.ngdoc b/docs/content/guide/i18n.ngdoc
index 78640feb92c9..7e70d5196cf3 100644
--- a/docs/content/guide/i18n.ngdoc
+++ b/docs/content/guide/i18n.ngdoc
@@ -18,8 +18,10 @@ application means providing translations and localized formats for the abstracte
 Angular supports i18n/l10n for {@link ng.filter:date date}, {@link ng.filter:number number} and
 {@link ng.filter:currency currency} filters.
 
-Additionally, Angular supports localizable pluralization support through the {@link
-ng.directive:ngPluralize `ngPluralize` directive}.
+Localizable pluralization is supported via the {@link ng.directive:ngPluralize `ngPluralize`
+directive}.  Additionally, you can use {@link guide/i18n#messageformat-extensions MessageFormat extensions} to
+`$interpolate` for localizable pluralization and gender support in all interpolations via the
+`ngMessageFormat` module.
 
 All localizable Angular components depend on locale-specific rule sets managed by the {@link
 ng.$locale `$locale` service}.
@@ -137,3 +139,242 @@ The Angular datetime filter uses the time zone settings of the browser. The same
 application will show different time information depending on the time zone settings of the
 computer that the application is running on. Neither JavaScript nor Angular currently supports
 displaying the date with a timezone specified by the developer.
+
+
+<a name="MessageFormat"></a>
+## MessageFormat extensions
+
+You can write localizable plural and gender based messages in Angular interpolation expressions and
+`$interpolate` calls.
+
+This syntax extension is provided by way of the `ngMessageFormat` module that your application can
+depend upon (shipped separately as `angular-message-format.min.js` and `angular-message-format.js`.)
+A current limitation of the `ngMessageFormat` module, is that it does not support redefining the
+`$interpolate` start and end symbols. Only the default `{{` and `}}` are allowed.
+
+The syntax extension is based on a subset of the ICU MessageFormat syntax that covers plurals and
+gender selections.  Please refer to the links in the “Further Reading” section at the bottom of this
+section.
+
+You may find it helpful to play with our [Plnkr Example](http://plnkr.co/edit/QBVRQ70dvKZDWmHW9RyR?p=preview)
+as you read the examples below.
+
+### Plural Syntax
+
+The syntax for plural based message selection looks like the following:
+
+```text
+{{NUMERIC_EXPRESSION, plural,
+    =0 {MESSAGE_WHEN_VALUE_IS_0}
+    =1 {MESSAGE_WHEN_VALUE_IS_1}
+    =2 {MESSAGE_WHEN_VALUE_IS_2}
+    =3 {MESSAGE_WHEN_VALUE_IS_3}
+    ...
+    zero {MESSAGE_WHEN_PLURAL_CATEGORY_IS_ZERO}
+    one {MESSAGE_WHEN_PLURAL_CATEGORY_IS_ONE}
+    two {MESSAGE_WHEN_PLURAL_CATEGORY_IS_TWO}
+    few {MESSAGE_WHEN_PLURAL_CATEGORY_IS_FEW}
+    many {MESSAGE_WHEN_PLURAL_CATEGORY_IS_MANY}
+    other {MESSAGE_WHEN_THERE_IS_NO_MATCH}
+}}
+```
+
+Please note that whitespace (including newline) is generally insignificant except as part of the
+actual message text that occurs in curly braces.  Whitespace is generally used to aid readability.
+
+Here, `NUMERIC_EXPRESSION` is an expression that evaluates to a numeric value based on which the
+displayed message should change based on pluralization rules.
+
+Following the Angular expression, you would denote the plural extension syntax by the `, plural,`
+syntax element.  The spaces there are optional.
+
+This is followed by a list of selection keyword and corresponding message pairs.  The "other"
+keyword and corresponding message are **required** but you may have as few or as many of the other
+categories as you need.
+
+#### Selection Keywords
+
+The selection keywords can be either exact matches or language dependent [plural
+categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html).
+
+Exact matches are written as the equal sign followed by the exact value. `=0`, `=1`, `=2` and
+`=123` are all examples of exact matches.  Note that there should be no space between the equal sign
+and the numeric value.
+
+Plural category matches are single words corresponding to the [plural
+categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html) of
+the CLDR plural category spec.  These categories vary by locale.  The "en" (English) locale, for
+example, defines just "one" and "other" while the "ga" (Irish) locale defines "one", "two", "few",
+"many" and "other".  Typically, you would just write the categories for your language.  During
+translation, the translators will add or remove more categories depending on the target locale.
+
+Exact matches always win over keyword matches.  Therefore, if you define both `=0` and `zero`, when
+the value of the expression is zero, the `=0` message is the one that will be selected.  (The
+duplicate keyword categories are helpful when used with the optional `offset` syntax described
+later.)
+
+
+#### Messages
+
+Messages immediately follow a selection keyword and are optionally preceded by whitespace.  They are
+written in single curly braces (`{}`).  They may contain Angular interpolation syntax inside them.
+In addition, the `#` symbol is a placeholder for the actual numeric value of the expression.
+
+### Simple plural example
+
+```text
+{{numMessages, plural,
+      =0 {You have no new messages}
+      =1 {You have one new message}
+   other {You have # new messages}
+}}
+```
+
+Because these messages can themselves contain Angular expressions, you could also write this as
+follows:
+
+```text
+{{numMessages, plural,
+      =0 {You have no new messages}
+      =1 {You have one new message}
+   other {You have {{numMessages}} new messages}
+}}
+```
+
+
+### Plural syntax with optional `offset`
+
+The plural syntax supports an optional `offset` syntax that is used in matching.  It's simpler to
+explain this with an example.
+
+```text
+{{recipients.length, plural, offset:1
+    =0    {You gave no gifts}
+    =1    {You gave {{recipients[0].name}} a gift}
+    one   {You gave {{recipients[0].name}} and one other person a gift}
+    other {You gave {{recipients[0].name}} and # other people a gift}
+}}
+```
+
+When an `offset` is specified, the matching works as follows.  First, the exact value of the Angular
+expression is matched against the exact matches (i.e. `=N` selectors) to find a match.  If there is
+one, that message is used.  If there was no match, then the offset value is subtracted from the
+value of the expression and locale specific pluralization rules are applied to this new value to
+obtain its plural category (such as “one”, “few”, “many”, etc.) and a match is attempted against the
+keyword selectors and the matching message is used.  If there was no match, then the “other”
+category (required) is used.  The value of the `#` character inside a message is the value of
+original expression reduced by the offset value that was specified.
+
+### Escaping / Quoting
+
+You will need to escape curly braces or the `#` character inside message texts if you want them to
+be treated literally with no special meaning.  You may quote/escape any character in your message
+text by preceding it with a `\` (backslash) character.  The backslash character removes any special
+meaning to the character that immediately follows it.  Therefore, you can escape or quote the
+backslash itself by preceding it with another backslash character.
+
+
+### Gender (aka select) Syntax
+
+The gender support is provided by the more generic "select" syntax that is more akin to a switch
+statement.  It is general enough to support use for gender based messages.
+
+The syntax for gender based message selection looks like the following:
+
+```text
+{{EXPRESSION, select,
+    male {MESSAGE_WHEN_EXPRESSION_IS_MALE}
+    female {MESSAGE_WHEN_EXPRESSION_IS_FEMALE}
+    ...
+    other {MESSAGE_WHEN_THERE_IS_NO_GENDER_MATCH}
+}}
+```
+
+Please note that whitespace (including newline) is generally insignificant except as part of the
+actual message text that occurs in curly braces.  Whitespace is generally used to aid readability.
+
+Here, `EXPRESSION` is an Angular expression that evaluates to the gender of the person that
+is used to select the message that should be displayed.
+
+The Angular expression is followed by `, select,` where the spaces are optional.
+
+This is followed by a list of selection keyword and corresponding message pairs.  The "other"
+keyword and corresponding message are **required** but you may have as few or as many of the other
+gender values as you need (i.e. it isn't restricted to male/female.)  Note however, that the
+matching is **case-sensitive**.
+
+#### Selection Keywords
+
+Selection keywords are simple words like "male" and "female".  The keyword, "other", and its
+corresponding message are required while others are optional.  It is used when the Angular
+expression does not match (case-insensitively) any of the other keywords specified.
+
+#### Messages
+
+Messages immediately follow a selection keyword and are optionally preceded by whitespace.  They are
+written in single curly braces (`{}`).  They may contain Angular interpolation syntax inside them.
+
+### Simple gender example
+
+```text
+{{friendGender, select,
+       male {Invite him}
+     female {Invite her}
+      other {Invite them}
+}}
+```
+
+### Nesting
+
+As mentioned in the syntax for plural and select, the embedded messages can contain Angular
+interpolation syntax.  Since you can use MessageFormat extensions in Angular interpolation, this
+allows you to nest plural and gender expressions in any order.
+
+Please note that if these are intended to reach a translator and be translated, it is recommended
+that the messages appear as a whole and not be split up.
+
+### More complex example that demonstrates nesting
+
+This is taken from the [plunker example](http://plnkr.co/edit/QBVRQ70dvKZDWmHW9RyR?p=preview) linked to earlier.
+
+```text
+{{recipients.length, plural, offset:1
+    =0 {You ({{sender.name}}) gave no gifts}
+    =1 { {{ recipients[0].gender, select,
+              male {You ({{sender.name}}) gave him ({{recipients[0].name}}) a gift.}
+              female {You ({{sender.name}}) gave her ({{recipients[0].name}}) a gift.}
+              other {You ({{sender.name}}) gave them ({{recipients[0].name}}) a gift.}
+          }}
+       }
+    one { {{ recipients[0].gender, select,
+              male {You ({{sender.name}}) gave him ({{recipients[0].name}}) and one other person a gift.}
+              female {You ({{sender.name}}) gave her ({{recipients[0].name}}) and one other person a gift.}
+              other {You ({{sender.name}}) gave them ({{recipients[0].name}}) and one other person a gift.}
+          }}
+       }
+    other {You ({{sender.name}}) gave {{recipients.length}} people gifts. }
+}}
+```
+
+### Differences from the ICU MessageFormat syntax
+
+This section is useful to you if you're already familiar with the ICU MessageFormat syntax.
+
+This syntax extension, while based on MessageFormat, has been designed to be backwards compatible
+with existing AngularJS interpolation expressions.  The key rule is simply this: **All
+interpolations are done inside double curlies.** The top level comma operator after an expression
+inside the double curlies causes MessageFormat extensions to be recognized.  Such a top level comma
+is otherwise illegal in an Angular expression and is used by MessageFormat to specify the function
+(such as plural/select) and it's related syntax.
+
+To understand the extension, take a look at the ICU MessageFormat syntax as specified by the ICU
+documentation.  Anywhere in that MessageFormat that you have regular message text and you want to
+substitute an expression, just put it in double curlies instead of single curlies that MessageFormat
+dictates.  This has a huge advantage.  **You are no longer limited to simple identifiers for
+substitutions**.  Because you are using double curlies, you can stick in any arbitrary interpolation
+syntax there, including nesting more MessageFormat expressions!
+
+### Further Reading
+For more details, please refer to our [design doc](https://docs.google.com/a/google.com/document/d/1pbtW2yvtmFBikfRrJd8VAsabiFkKezmYZ_PbgdjQOVU/edit).
+You can read more about the ICU MessageFormat syntax at
+[Formatting Messages | ICU User Guide](http://userguide.icu-project.org/formatparse/messages#TOC-MessageFormat).
diff --git a/docs/content/guide/index.ngdoc b/docs/content/guide/index.ngdoc
index ee5c974e1129..1dacc7db86af 100644
--- a/docs/content/guide/index.ngdoc
+++ b/docs/content/guide/index.ngdoc
@@ -53,7 +53,7 @@ In Angular applications, you move the job of filling page templates with data fr
 
 ## Specific Topics
 
-* **Login: **[Google example](https://developers.google.com/+/photohunt/python), [AngularJS Faceb0ok library](https://github.com/pc035860/angular-easyfb), [Facebook example](http://blog.brunoscopelliti.com/facebook-authentication-in-your-angularjs-web-app), [authentication strategy](http://blog.brunoscopelliti.com/deal-with-users-authentication-in-an-angularjs-web-app), [unix-style authorization](http://frederiknakstad.com/authentication-in-single-page-applications-with-angular-js/)
+* **Login: **[Google example](https://developers.google.com/+/photohunt/python), [AngularJS Facebook library](https://github.com/pc035860/angular-easyfb), [Facebook example](http://blog.brunoscopelliti.com/facebook-authentication-in-your-angularjs-web-app), [authentication strategy](http://blog.brunoscopelliti.com/deal-with-users-authentication-in-an-angularjs-web-app), [unix-style authorization](http://frederiknakstad.com/authentication-in-single-page-applications-with-angular-js/)
 * **Mobile:** [Angular on Mobile Guide](http://www.ng-newsletter.com/posts/angular-on-mobile.html), [PhoneGap](http://devgirl.org/2013/06/10/quick-start-guide-phonegap-and-angularjs/)
 * **Other Languages:** [CoffeeScript](http://www.coffeescriptlove.com/2013/08/angularjs-and-coffeescript-tutorials.html), [Dart](https://github.com/angular/angular.dart.tutorial/wiki)
 * **Realtime: **[Socket.io](http://www.creativebloq.com/javascript/angularjs-collaboration-board-socketio-2132885), [OmniBinder](https://github.com/jeffbcross/omnibinder)
diff --git a/docs/content/guide/migration.ngdoc b/docs/content/guide/migration.ngdoc
index 25f3bcd681af..a77534fc2856 100644
--- a/docs/content/guide/migration.ngdoc
+++ b/docs/content/guide/migration.ngdoc
@@ -13,6 +13,337 @@ which drives many of these changes.
 * Several new features, especially animations, would not be possible without a few changes.
 * Finally, some outstanding bugs were best fixed by changing an existing API.
 
+# Migrating from 1.3 to 1.4
+
+Angular 1.4 fixes major animation issues and introduces a new API for `ngCookies`. Further, there
+are changes to `ngMessages`, `$compile`, `ngRepeat`, `ngOptions `and some fixes to core filters:
+`limitTo` and `filter`.
+
+The reason for the ngAnimate refactor was to fix timing issues and to expose new APIs to allow
+for developers to construct more versatile animations.  We now have access to `$animateCss`
+and the many timing-oriented bugs were fixed which results in smoother animations.
+If animation is something of interest, then please read over the breaking changes below for animations when
+`ngAnimate` is used.
+
+`ngMessages` has been upgraded to allow for dynamic message resolution. This handy feature allows for developers
+to render error messages with ngMessages that are listed with a directive such as ngRepeat. A great usecase for this
+involves pulling error message data from a server and then displaying that data via the mechanics of ngMessages. Be
+sure to read the breaking change involved with `ngMessagesInclude` to upgrade your template code.
+
+Other changes, such as the ordering of elements with ngRepeat and ngOptions, may also affect the behavior of your
+application. And be sure to also read up on the changes to `$cookies`. The migration jump from 1.3 to 1.4 should be
+relatively straightforward otherwise.
+
+
+
+
+## Animation (`ngAnimate`)
+
+Animations in 1.4 have been refactored internally, but the API has stayed much the same. There are, however,
+some breaking changes that need to be addressed when upgrading to 1.4.
+
+Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+JavaScript and CSS animations can no longer be run in
+parallel. With earlier versions of ngAnimate, both CSS and JS animations
+would be run together when multiple animations were detected. This
+feature has been removed, however, the same effect, with even more
+possibilities, can be achieved by injecting `$animateCss` into a
+JavaScript-defined animation and creating custom CSS-based animations
+from there.
+
+By using `$animateCss` inside of a JavaScript animation in Angular 1.4, we can trigger custom CSS-based animations
+directly from our JavaScript code.
+
+```js
+ngModule.animation('.slide-animation', ['$animateCss', function($animateCss) {
+  return {
+    enter: function(element, doneFn) {
+      // this will trigger a `.ng-enter` and `.ng-enter-active` CSS animation
+      var animation = $animateCss(element, {
+        event: 'enter'
+        // any other CSS-related properties
+        //   addClass: 'some-class',
+        //   removeClass: 'some-other-class',
+        //   from: {},
+        //   to: {}
+      });
+
+      // make sure to read the ngAnimate docs to understand how this works
+      animation.start().done(doneFn);
+    }
+  }
+}]);
+```
+
+{@link ngAnimate.$animateCss Click here to learn how to use $animateCss in your animation code}
+
+Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+animation-related callbacks are now fired on `$animate.on` instead of directly being on the element.
+
+```js
+// < 1.4
+element.on('$animate:before', function(e, data) {
+  if (data.event === 'enter') { ... }
+});
+element.off('$animate:before', fn);
+
+// 1.4+
+$animate.on('enter', element, function(data) {
+  //...
+});
+$animate.off('enter', element, fn);
+```
+
+Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+the function params for `$animate.enabled()` when an element is used are now flipped. This fix allows
+the function to act as a getter when a single element param is provided.
+
+```js
+// < 1.4
+$animate.enabled(false, element);
+
+// 1.4+
+$animate.enabled(element, false);
+```
+
+Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+in addition to disabling the children of the element, `$animate.enabled(element, false)` will now also
+disable animations on the element itself.
+
+Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+there is no need to call `$scope.$apply` or `$scope.$digest` inside of a animation promise callback anymore
+since the promise is resolved within a digest automatically. (Not to worry, any extra digests will not be
+run unless the promise is used.)
+
+```js
+// < 1.4
+$animate.enter(element).then(function() {
+  $scope.$apply(function() {
+    $scope.explode = true;
+  });
+});
+
+// 1.4+
+$animate.enter(element).then(function() {
+  $scope.explode = true;
+});
+```
+
+Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
+when an enter, leave or move animation is triggered then it will always end any pending or active parent
+class based animations (animations triggered via ngClass) in order to ensure that any CSS styles are resolved in time.
+
+
+
+
+## Forms (`ngMessages`, `ngOptions`, `select`)
+
+### ngMessages
+The ngMessages module has also been subject to an internal refactor to allow it to be more flexible
+and compatible with dynamic message data. The `ngMessage` directive now supports a new attribute
+called `ng-message-exp` which will evaluate an expression and will keep track of that expression
+as it changes in order to re-evaluate the listed messages.
+
+[Click here to learn more about dynamic ng-messages](https://docs.angularjs.org/api/ngMessages#dynamic-messaging)
+
+There is only one breaking change. Please consider the following when including remote
+message templates via `ng-messages-include`:
+
+Due to [c9a4421f](https://github.com/angular/angular.js/commit/c9a4421fc3c97448527eadef1f42eb2f487ec2e0),
+the `ngMessagesInclude` attribute has now been removed and cannot be used in the same element containing
+the `ngMessages` directive. Instead, `ngMessagesInclude` is to be used on its own element inline with
+other inline messages situated as children within the `ngMessages` container directive.
+
+```html
+<!-- AngularJS 1.3.x -->
+<div ng-messages="model.$error" ng-messages-include="remote.html">
+  <div ng-message="required">Your message is required</div>
+</div>
+
+<!-- AngularJS 1.4.x -->
+<div ng-messages="model.$error">
+  <div ng-message="required">Your message is required</div>
+  <div ng-messages-include="remote.html"></div>
+</div>
+```
+
+Depending on where the `ngMessagesInclude` directive is placed it will be prioritized inline with the other messages
+before and after it.
+
+### ngOptions
+
+The `ngOptions` directive has also been refactored and as a result some long-standing bugs
+have been fixed. The breaking changes are comparatively minor and should not affect most applications.
+
+Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
+when `ngOptions` renders the option values within the DOM, the resulting HTML code is different.
+Normally this should not affect your application at all, however, if your code relies on inspecting
+the value property of `<option>` elements (that `ngOptions` generates) then be sure
+to [read the details](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef).
+
+Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
+when iterating over an object's properties using the `(key, value) in obj` syntax
+the order of the elements used to be sorted alphabetically. This was an artificial
+attempt to create a deterministic ordering since browsers don't guarantee the order.
+But in practice this is not what people want and so this change iterates over properties
+in the order they are returned by Object.keys(obj), which is almost always the order
+in which the properties were defined.
+
+
+### select
+
+Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
+the `select` directive will now use strict comparison of the `ngModel` scope value against `option`
+values to determine which option is selected. This means non-string scope values (such as `Number` or `Boolean`)
+will not be matched against equivalent option strings (such as the strings `"123"`, `"true"` or `"false"`).
+
+In Angular 1.3.x, setting `scope.x = 200` would select the option with the value 200 in the following `select`:
+
+```
+<select ng-model="x">
+  <option value="100">100</option>
+  <option value="200">200</option>
+</select>
+```
+
+In Angular 1.4.x, the 'unknown option' will be selected.
+
+To remedy this, you can initialize the model as a string: `scope.x = '200'`, or if you want to
+keep the model as a `Number`, you can do the conversion via `$formatters` and `$parsers` on `ngModel`:
+
+```js
+ngModelCtrl.$parsers.push(function(value) {
+  return parseInt(value, 10); // Convert option value to number
+});
+
+ngModelCtrl.$formatters.push(function(value) {
+  return value.toString(); // Convert scope value to string
+});
+```
+
+## Templating (`ngRepeat`, `$compile`)
+
+### ngRepeat
+
+Due to [c260e738](https://github.com/angular/angular.js/commit/c260e7386391877625eda086480de73e8a0ba921),
+previously, the order of items when using ngRepeat to iterate over object properties was guaranteed to be consistent
+by sorting the keys into alphabetic order.
+
+Now, the order of the items is browser dependent based on the order returned
+from iterating over the object using the `for key in obj` syntax.
+
+It seems that browsers generally follow the strategy of providing
+keys in the order in which they were defined, although there are exceptions
+when keys are deleted and reinstated. See
+https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_issues
+
+The best approach is to convert Objects into Arrays by a filter such as
+https://github.com/petebacondarwin/angular-toArrayFilter
+or some other mechanism, and then sort them manually in the order you need.
+
+
+### $compile
+
+Due to [6a38dbfd](https://github.com/angular/angular.js/commit/6a38dbfd3c34c8f9efff503d17eb3cbeb666d422),
+previously, '&' expressions would always set up a function in the isolate scope. Now, if the binding
+is marked as optional and the attribute is not specified, no function will be added to the isolate scope.
+
+Due to [62d514b](https://github.com/angular/angular.js/commit/62d514b06937cc7dd86e973ea11165c88343b42d),
+returning an object from a controller constructor function will now override the scope. Views that use the
+controllerAs method will no longer get the this reference, but the returned object.
+
+
+## Cookies (`ngCookies`)
+
+Due to [38fbe3ee](https://github.com/angular/angular.js/commit/38fbe3ee8370fc449b82d80df07b5c2ed2cd5fbe),
+`$cookies` will no longer expose properties that represent the current browser cookie
+values. `$cookies` no longer polls the browser for changes to the cookies and ***no longer copies
+cookie values onto the `$cookies` object***.
+
+This was changed because the polling is expensive and caused issues with the `$cookies` properties
+not synchronizing correctly with the actual browser cookie values (The reason the polling
+was originally added was to allow communication between different tabs,
+but there are better ways to do this today, for example `localStorage`.)
+
+The new API on `$cookies` is as follows:
+
+ * `get`
+ * `put`
+ * `getObject`
+ * `putObject`
+ * `getAll`
+ * `remove`
+
+You must explictly use the methods above in order to access cookie data. This also means that
+you can no longer watch the properties on `$cookies` to detect changes
+that occur on the browsers cookies.
+
+This feature is generally only needed if a 3rd party library was programmatically
+changing the cookies at runtime. If you rely on this then you must either write code that
+can react to the 3rd party library making the changes to cookies or implement your own polling
+mechanism.
+
+**DEPRECATION NOTICE**
+
+`$cookieStore` is now deprecated as all the useful logic
+has been moved to `$cookies`, to which `$cookieStore` now simply
+delegates calls.
+
+
+
+
+## Server Requests (`$http`)
+
+Due to [5da1256](https://github.com/angular/angular.js/commit/5da1256fc2812d5b28fb0af0de81256054856369),
+`transformRequest` functions can no longer modify request headers.
+
+Before this commit `transformRequest` could modify request headers, ex.:
+
+```javascript
+function requestTransform(data, headers) {
+    headers = angular.extend(headers(), {
+      'X-MY_HEADER': 'abcd'
+    });
+  }
+  return angular.toJson(data);
+}
+```
+
+This behavior was unintended and undocumented, so the change should affect very few applications. If one
+needs to dynamically add / remove headers it should be done in a header function, for example:
+
+```javascript
+$http.get(url, {
+  headers: {
+    'X-MY_HEADER': function(config) {
+      return 'abcd'; //you've got access to a request config object to specify header value dynamically
+    }
+  }
+})
+```
+
+
+
+
+## Filters (`filter`, `limitTo`)
+
+### `filter` filter
+Due to [cea8e751](https://github.com/angular/angular.js/commit/cea8e75144e6910b806b63a6ec2a6d118316fddd),
+the `filter` filter will throw an error when used with a non-array. Beforehand it would silently
+return an empty array.
+
+If necessary, this can be worked around by converting an object to an array,
+using a filter such as https://github.com/petebacondarwin/angular-toArrayFilter.
+
+### `limitTo` filter
+Due to [a3c3bf33](https://github.com/angular/angular.js/commit/a3c3bf3332e5685dc319c46faef882cb6ac246e1),
+the limitTo filter has changed behavior when the provided limit value is invalid.
+Now, instead of returning empty object/array, it returns unchanged input.
+
+
+
+
+
 # Migrating from 1.2 to 1.3
 
 ## Controllers
diff --git a/docs/content/guide/module.ngdoc b/docs/content/guide/module.ngdoc
index 9dc9e941d643..3ac4a3c0385e 100644
--- a/docs/content/guide/module.ngdoc
+++ b/docs/content/guide/module.ngdoc
@@ -76,7 +76,7 @@ that you break your application to multiple modules like this:
     initialization code.
 
 We've also
-[written a document](http://blog.angularjs.org/2014/02/an-angularjs-style-guide-and-best.html)
+[written a document](http://angularjs.blogspot.com/2014/02/an-angularjs-style-guide-and-best.html)
 on how we organize large apps at Google.
 
 The above is a suggestion. Tailor it to your needs.
@@ -140,7 +140,7 @@ The above is a suggestion. Tailor it to your needs.
 # Module Loading & Dependencies
 
 A module is a collection of configuration and run blocks which get applied to the application
-during the bootstrap process. In its simplest form the module consist of a collection of two kinds
+during the bootstrap process. In its simplest form the module consists of a collection of two kinds
 of blocks:
 
   1. **Configuration blocks** - get executed during the provider registrations and configuration
diff --git a/docs/content/guide/scope.ngdoc b/docs/content/guide/scope.ngdoc
index 92999f82ba6d..7fbeb233f7ef 100644
--- a/docs/content/guide/scope.ngdoc
+++ b/docs/content/guide/scope.ngdoc
@@ -5,7 +5,7 @@
 
 # What are Scopes?
 
-{@link ng.$rootScope.Scope scope} is an object that refers to the application
+{@link ng.$rootScope.Scope Scope} is an object that refers to the application
 model. It is an execution context for {@link expression expressions}. Scopes are
 arranged in hierarchical structure which mimic the DOM structure of the application. Scopes can
 watch {@link guide/expression expressions} and propagate events.
@@ -245,7 +245,7 @@ of the `$watch` expressions and compares them with the previous value. This dirt
 asynchronously. This means that assignment such as `$scope.username="angular"` will not
 immediately cause a `$watch` to be notified, instead the `$watch` notification is delayed until
 the `$digest` phase. This delay is desirable, since it coalesces multiple model updates into one
-`$watch` notification as well as it guarantees that during the `$watch` notification no other
+`$watch` notification as well as guarantees that during the `$watch` notification no other
 `$watch`es are running. If a `$watch` changes the value of the model, it will force additional
 `$digest` cycle.
 
@@ -264,7 +264,7 @@ the `$digest` phase. This delay is desirable, since it coalesces multiple model
   3. **Model mutation**
 
      For mutations to be properly observed, you should make them only within the {@link
-     ng.$rootScope.Scope#$apply scope.$apply()}. (Angular APIs do this
+     ng.$rootScope.Scope#$apply scope.$apply()}. Angular APIs do this
      implicitly, so no extra `$apply` call is needed when doing synchronous work in controllers,
      or asynchronous work with {@link ng.$http $http}, {@link ng.$timeout $timeout}
      or {@link ng.$interval $interval} services.
diff --git a/docs/content/guide/security.ngdoc b/docs/content/guide/security.ngdoc
index 65294566a31e..ea0f4ad096dc 100644
--- a/docs/content/guide/security.ngdoc
+++ b/docs/content/guide/security.ngdoc
@@ -39,7 +39,7 @@ In general, we recommend against this because it can create unintended XSS vecto
 
 However, it's ok to mix server-side templating in the bootstrap template (`index.html`) as long
 as user input cannot be used on the server to output html that would then be processed by Angular
-in a way that would cause allow for arbitrary code execution.
+in a way that would allow for arbitrary code execution.
 
 For instance, you can use server-side templating to dynamically generate CSS, URLs, etc, but not
 for generating templates that are bootstrapped/compiled by Angular.
diff --git a/docs/content/guide/services.ngdoc b/docs/content/guide/services.ngdoc
index ac4e42b6c28f..19ccae7fc3f1 100644
--- a/docs/content/guide/services.ngdoc
+++ b/docs/content/guide/services.ngdoc
@@ -82,7 +82,7 @@ on the service.
 ### Registering Services
 
 Services are registered to modules via the {@link angular.Module Module API}.
-Typically you use the {@link angular.module Module#factory} API to register a service:
+Typically you use the {@link angular.Module#factory Module factory} API to register a service:
 
 ```js
 var myModule = angular.module('myModule', []);
@@ -181,7 +181,7 @@ of a real browser alert.
 
 ```js
 var mock, notify;
-
+beforeEach(module('myServiceModule'));
 beforeEach(function() {
   mock = {alert: jasmine.createSpy()};
 
diff --git a/docs/content/guide/unit-testing.ngdoc b/docs/content/guide/unit-testing.ngdoc
index 6e3f2a205e94..e17ca02d4bee 100644
--- a/docs/content/guide/unit-testing.ngdoc
+++ b/docs/content/guide/unit-testing.ngdoc
@@ -62,7 +62,7 @@ are available on [the Karma website](http://karma-runner.github.io/0.12/intro/in
 
 ### Jasmine
 
-[Jasmine](http://jasmine.github.io/1.3/introduction.html) is a test driven development framework for
+[Jasmine](http://jasmine.github.io/1.3/introduction.html) is a behavior driven development framework for
 JavaScript that has become the most popular choice for testing Angular applications. Jasmine
 provides functions to help with structuring your tests and also making assertions. As your tests
 grow, keeping them well structured and documented is vital, and Jasmine helps achieve this.
@@ -260,6 +260,13 @@ myModule.filter('length', function() {
 });
 
 describe('length filter', function() {
+
+  var $filter;
+
+  beforeEach(inject(function(_$filter_){
+    $filter = _$filter_;
+  }));
+
   it('returns 0 when given null', function() {
     var length = $filter('length');
     expect(length(null)).toEqual(0);
diff --git a/docs/content/misc/contribute.ngdoc b/docs/content/misc/contribute.ngdoc
index c4fcdd121b6a..b3f125f4dd63 100644
--- a/docs/content/misc/contribute.ngdoc
+++ b/docs/content/misc/contribute.ngdoc
@@ -153,7 +153,7 @@ grunt test:unit --browsers Opera,Firefox
 
 Note there should be _no spaces between browsers_. `Opera, Firefox` is INVALID.
 
-During development it's however more productive to continuously run unit tests every time the source or test files
+During development, however, it's more productive to continuously run unit tests every time the source or test files
 change. To execute tests in this mode run:
 
 1. To start the Karma server, capture Chrome browser and run unit tests, run:
diff --git a/docs/content/misc/downloading.ngdoc b/docs/content/misc/downloading.ngdoc
index 6737adf64d28..e96b607eaacd 100644
--- a/docs/content/misc/downloading.ngdoc
+++ b/docs/content/misc/downloading.ngdoc
@@ -15,14 +15,14 @@ development.
 production.
 
 To point your code to an angular script on the Google CDN server, use the following template.  This
-example points to the minified version 1.3.12:
+example points to the minified version 1.3.14:
 
 ```
   <!doctype html>
   <html ng-app>
     <head>
       <title>My Angular App</title>
-      <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.12/angular.min.js"></script>
+      <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js"></script>
     </head>
     <body>
     </body>
diff --git a/docs/content/misc/faq.ngdoc b/docs/content/misc/faq.ngdoc
index 2a3d85f0e5cf..a10e11c64c2e 100644
--- a/docs/content/misc/faq.ngdoc
+++ b/docs/content/misc/faq.ngdoc
@@ -20,6 +20,42 @@ AngularJS is 100% JavaScript, 100% client-side and compatible with both desktop
 So it's definitely not a plugin or some other native browser extension.
 
 
+### What is the AngularJS versioning strategy?
+
+In Angular 1 we do not allow intentional breaking changes to appear in versions where only the "patch"
+number changes. For example between 1.3.12 and 1.3.13 there can be no breaking changes. We do allow
+breaking changes happen between "minor" number changes. For example between 1.3.15 and 1.4.0 there
+will be a number of breaking changes. We also allow breaking changes between beta releases of Angular.
+For example between 1.4.0-beta.4 and 1.4.0-beta.5 there may be breaking changes. We try hard to minimize
+these kinds of change only to those where there is a strong use case such as a strongly requested feature
+improvement, a considerable simplification of the code or a measurable performance improvement.
+
+When adding new code to branches of Angular, have a very stringent commit policy:
+
+- Every commit must contain tests and documentation updates alongside the code changes and that all the
+tests must pass;
+- Commit messages must be written in a specific manner that allows us to parse them and extract the changes
+for release notes.
+
+The Angular code base has a very large set of unit tests (over 4000) and end to end tests, which are pretty
+comprehensive. This means that a breaking change will require one or more tests to be changed to allow the
+tests to pass. So when a commit includes tests that are being removed or modified, this is a flag that the
+code might include a breaking change. When reviewing the commit we can then decide whether there really is
+a breaking change and if it is appropriate for the branch to which it is being merged. If so, then we
+require that the commit message contains an appropriate breaking change message.
+
+Additionally, when a commit lands in our master repository it is synced to Google where we test it against
+over 2000 applications using the test suites of these applications. This allows us to catch regressions
+quickly before a release. We've had a pretty good experience with this setup. Only bugs that affect features
+not used at Google or without sufficient test coverage, have a chance of making it through.
+
+Lastly, when we are making a release we generate updates to the changelog directly from the commits. This
+generated update contains a highlighted section that contains all the breaking changes that have been
+extracted from the commits. We can quickly see in the new changelog exactly what commits contain breaking
+changes and so can application developers when they are deciding whether to update to a new version of
+Angular.
+
+
 ### Is AngularJS a templating system?
 
 At the highest level, Angular does look like just another templating system. But there is one
@@ -67,7 +103,7 @@ illustration, we typically build snappy apps with hundreds or thousands of activ
 
 ### How big is the angular.js file that I need to include?
 
-The size of the file is < 36KB compressed and minified.
+The size of the file is ~50KB compressed and minified.
 
 
 ### Can I use the open-source Closure Library with Angular?
@@ -158,7 +194,7 @@ Conditionally showing and hiding things using jQuery is a common pattern in othe
 `ng-show` (and `ng-hide`) conditionally show and hide elements based on boolean expressions.
 Describe the conditions for showing and hiding an element in terms of `$scope` variables:
 
-    <div ng-show="!loggedIn">Click <a href="#/login">here</a> to log in</div>
+    <div ng-show="!loggedIn"><a href="#/login">Click here to log in</a></div>
 
 Note also the counterpart `ng-hide` and similar `ng-disabled`.
 Note especially the powerful `ng-switch` that should be used instead of several mutually exclusive `ng-show`s.
diff --git a/docs/content/tutorial/index.ngdoc b/docs/content/tutorial/index.ngdoc
index af6943387d42..22139e5c1c35 100644
--- a/docs/content/tutorial/index.ngdoc
+++ b/docs/content/tutorial/index.ngdoc
@@ -129,7 +129,8 @@ Once you have Node.js installed on your machine you can download the tool depend
 npm install
 ```
 
-This command will download the following tools, into the `node_modules` directory:
+This command reads angular-phonecat's `package.json` file and downloads the following tools
+into the `node_modules` directory:
 
 - [Bower][bower] - client-side code package manager
 - [Http-Server][http-server] - simple local static web server
@@ -198,7 +199,7 @@ http://localhost:8000/app/index.html
 
 <div class="alert alert-info">
 To serve the web app on a different ip address or port, edit the "start" script within package.json.
-You can `-a` to set the address and `-p` to set the port.
+You can use `-a` to set the address and `-p` to set the port.
 </div>
 
 ### Running Unit Tests
@@ -270,6 +271,7 @@ It is good to run the end to end tests whenever you make changes to the HTML vie
 that the application as a whole is executing correctly.  It is very common to run End to End tests
 before pushing a new commit of changes to a remote repository.
 
+Now that you have set up your local machine, let's get started with the tutorial: {@link step_00 Step 0 - Bootstrapping}
 
 [git]: http://git-scm.com/
 [node]: http://nodejs.org/
diff --git a/docs/content/tutorial/step_00.ngdoc b/docs/content/tutorial/step_00.ngdoc
index c56fb3761f60..a3a913b4600c 100644
--- a/docs/content/tutorial/step_00.ngdoc
+++ b/docs/content/tutorial/step_00.ngdoc
@@ -31,7 +31,7 @@ npm install
 
 To see the app running in a browser, open a *separate* terminal/command line tab or window, then
 run `npm start` to start the web server. Now, open a browser window for the app and navigate to
-<a href="http://localhost:8000/app/" target="_blank">`http://localhost:8000/app/`</a>
+<a href="http://localhost:8000/app/" target="_blank" title="Open app on localhost">`http://localhost:8000/app/`</a>
 
 Note that if you already ran the master branch app prior to checking out step-0, you may see the cached
 master version of the app in your browser window at this point. Just hit refresh to re-load the page.
@@ -65,7 +65,7 @@ __`app/index.html`:__
 
 ## What is the code doing?
 
-* `ng-app` directive:
+**`ng-app` directive:**
 
           <html ng-app>
 
@@ -77,41 +77,41 @@ __`app/index.html`:__
   This gives application developers the freedom to tell Angular if the entire html page or only a
   portion of it should be treated as the Angular application.
 
-* AngularJS script tag:
+**AngularJS script tag:**
 
           <script src="bower_components/angular/angular.js">
 
-  This code downloads the `angular.js` script and registers a callback that will be executed by the
+  This code downloads the `angular.js` script which registers a callback that will be executed by the
 browser when the containing HTML page is fully downloaded. When the callback is executed, Angular
 looks for the {@link ng.directive:ngApp ngApp} directive. If
 Angular finds the directive, it will bootstrap the application with the root of the application DOM
 being the element on which the `ngApp` directive was defined.
 
-* Double-curly binding with an expression:
+**Double-curly binding with an expression:**
 
           Nothing here {{'yet' + '!'}}
 
-  This line demonstrates two core features of Angular's templating capabilities:
+This line demonstrates two core features of Angular's templating capabilities:
 
-    * a binding, denoted by double-curlies `{{ }}`
-    * a simple expression `'yet' + '!'` used in this binding.
+  * a binding, denoted by double-curlies `{{ }}`
+  * a simple expression `'yet' + '!'` used in this binding.
 
-  The binding tells Angular that it should evaluate an expression and insert the result into the
-  DOM in place of the binding. Rather than a one-time insert, as we'll see in the next steps, a
-  binding will result in efficient continuous updates whenever the result of the expression
-  evaluation changes.
+The binding tells Angular that it should evaluate an expression and insert the result into the
+DOM in place of the binding. Rather than a one-time insert, as we'll see in the next steps, a
+binding will result in efficient continuous updates whenever the result of the expression
+evaluation changes.
 
-  {@link guide/expression Angular expression} is a JavaScript-like code snippet that is
-  evaluated by Angular in the context of the current model scope, rather than within the scope of
-  the global context (`window`).
+{@link guide/expression Angular expression} is a JavaScript-like code snippet that is
+evaluated by Angular in the context of the current model scope, rather than within the scope of
+the global context (`window`).
 
-  As expected, once this template is processed by Angular, the html page contains the text:
-  "Nothing here yet!".
+As expected, once this template is processed by Angular, the html page contains the text:
+"Nothing here yet!".
 
 ## Bootstrapping AngularJS apps
 
 Bootstrapping AngularJS apps automatically using the `ngApp` directive is very easy and suitable
-for most cases. In advanced cases, such as when using script loaders, you can use
+for most cases. In advanced cases, such as when using script loaders, you can use the
 {@link guide/bootstrap imperative / manual way} to bootstrap the app.
 
 There are 3 important things that happen during the app bootstrap:
diff --git a/docs/content/tutorial/step_07.ngdoc b/docs/content/tutorial/step_07.ngdoc
index dc3a5a2ee986..071d52c76f51 100644
--- a/docs/content/tutorial/step_07.ngdoc
+++ b/docs/content/tutorial/step_07.ngdoc
@@ -33,17 +33,17 @@ We are using [Bower][bower] to install client-side dependencies.  This step upda
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "angular": "~1.3.0",
-    "angular-mocks": "~1.3.0",
-    "jquery": "2.1.1",
+    "angular": "1.4.x",
+    "angular-mocks": "1.4.x",
+    "jquery": "~2.1.1",
     "bootstrap": "~3.1.1",
-    "angular-route": "~1.3.0"
+    "angular-route": "~1.4.0"
   }
 }
 ```
 
-The new dependency `"angular-route": "~1.3.0"` tells bower to install a version of the
-angular-route component that is compatible with version 1.3.x.  We must tell bower to download
+The new dependency `"angular-route": "~1.4.0"` tells bower to install a version of the
+angular-route component that is compatible with version 1.4.x.  We must tell bower to download
 and install this dependency.
 
 If you have bower installed globally, then you can run `bower install` but for this project, we have
@@ -313,7 +313,7 @@ to various URLs and verify that the correct view was rendered.
    it('should redirect index.html to index.html#/phones', function() {
     browser.get('app/index.html');
     browser.getLocationAbsUrl().then(function(url) {
-        expect(url.split('#')[1]).toBe('/phones');
+        expect(url).toEqual('/phones');
       });
   });
 
diff --git a/docs/content/tutorial/step_12.ngdoc b/docs/content/tutorial/step_12.ngdoc
index 26bcf7d09c07..17dd6241244f 100644
--- a/docs/content/tutorial/step_12.ngdoc
+++ b/docs/content/tutorial/step_12.ngdoc
@@ -225,7 +225,7 @@ inserted into and removed from the list:
   * The `ng-leave` class is applied when they're removed from the list.
 
 The phone listing items are added and removed depending on the data passed to the `ng-repeat` attribute.
-For example, if the filter data changes the items will be animated in and out of the repeat list.
+For example, if the filter data changes, the items will be animated in and out of the repeat list.
 
 Something important to note is that when an animation occurs, two sets of CSS classes
 are added to the element:
@@ -233,7 +233,7 @@ are added to the element:
   1. a "starting" class that represents the style at the beginning of the animation
   2. an "active" class that represents the style at the end of the animation
 
-The name of the starting class is the name of event that is fired (like `enter`, `move` or `leave`) prefixed with
+The name of the starting class is the name of the event that is fired (like `enter`, `move` or `leave`) prefixed with
 `ng-`. So an `enter` event will result in a class called `ng-enter`.
 
 The active class name is the same as the starting class's but with an `-active` suffix.
diff --git a/i18n/closure/currencySymbols.js b/i18n/closure/currencySymbols.js
index ef207ee00d6c..6396efd811c1 100644
--- a/i18n/closure/currencySymbols.js
+++ b/i18n/closure/currencySymbols.js
@@ -303,8 +303,8 @@ goog.i18n.currency.CurrencyInfo = {
   'KRW': [0, '\u20A9', 'KR₩'],
   'LKR': [2, 'Rs', 'SLRs'],
   'LTL': [2, 'Lt', 'Lt'],
-  'LVL': [2, 'Ls', 'Ls'],
   'MNT': [0, '\u20AE', 'MN₮'],
+  'MVR': [2, 'Rf', 'MVR'],
   'MXN': [2, '$', 'Mex$'],
   'MYR': [2, 'RM', 'RM'],
   'NOK': [50, 'kr', 'NOkr'],
@@ -339,6 +339,7 @@ goog.i18n.currency.CurrencyInfo = {
 goog.i18n.currency.CurrencyInfoTier2 = {
   'AFN': [48, 'Af.', 'AFN'],
   'AMD': [0, 'Dram', 'dram'],
+  'ANG': [2, 'NAf.', 'ANG'],
   'AOA': [2, 'Kz', 'Kz'],
   'ARS': [2, '$', 'AR$'],
   'AWG': [2, 'Afl.', 'Afl.'],
@@ -414,6 +415,7 @@ goog.i18n.currency.CurrencyInfoTier2 = {
   'SLL': [0, 'SLL', 'SLL'],
   'SOS': [0, 'SOS', 'SOS'],
   'SRD': [2, '$', 'SR$'],
+  'SSP': [2, '£', 'SSP'],
   'STD': [0, 'Db', 'Db'],
   'SYP': [0, '£', 'SY£'],
   'SZL': [2, 'SZL', 'SZL'],
@@ -430,5 +432,6 @@ goog.i18n.currency.CurrencyInfoTier2 = {
   'XCD': [2, '$', 'EC$'],
   'XOF': [0, 'CFA', 'CFA'],
   'XPF': [0, 'FCFP', 'FCFP'],
-  'ZMK': [0, 'ZMK', 'ZMK']
+  'ZMW': [0, 'ZMW', 'ZMW'],
+  'ZWD': [0, '$', 'Z$']
 };
diff --git a/i18n/closure/datetimeSymbols.js b/i18n/closure/datetimeSymbols.js
index ad299351e813..2cf5baf80b5e 100644
--- a/i18n/closure/datetimeSymbols.js
+++ b/i18n/closure/datetimeSymbols.js
@@ -17,7 +17,7 @@
  *
  * This file is autogenerated by script.  See
  * http://go/generate_datetime_constants.py using --for_closure
- * File generated from CLDR ver. 26
+ * File generated from CLDR ver. 27.0.1
  *
  * To reduce the file size (which may cause issues in some JS
  * developing environments), this file will only contain locales
@@ -36,9 +36,11 @@ goog.provide('goog.i18n.DateTimeSymbols_af');
 goog.provide('goog.i18n.DateTimeSymbols_am');
 goog.provide('goog.i18n.DateTimeSymbols_ar');
 goog.provide('goog.i18n.DateTimeSymbols_az');
+goog.provide('goog.i18n.DateTimeSymbols_be');
 goog.provide('goog.i18n.DateTimeSymbols_bg');
 goog.provide('goog.i18n.DateTimeSymbols_bn');
 goog.provide('goog.i18n.DateTimeSymbols_br');
+goog.provide('goog.i18n.DateTimeSymbols_bs');
 goog.provide('goog.i18n.DateTimeSymbols_ca');
 goog.provide('goog.i18n.DateTimeSymbols_chr');
 goog.provide('goog.i18n.DateTimeSymbols_cs');
@@ -50,6 +52,7 @@ goog.provide('goog.i18n.DateTimeSymbols_de_CH');
 goog.provide('goog.i18n.DateTimeSymbols_el');
 goog.provide('goog.i18n.DateTimeSymbols_en');
 goog.provide('goog.i18n.DateTimeSymbols_en_AU');
+goog.provide('goog.i18n.DateTimeSymbols_en_CA');
 goog.provide('goog.i18n.DateTimeSymbols_en_GB');
 goog.provide('goog.i18n.DateTimeSymbols_en_IE');
 goog.provide('goog.i18n.DateTimeSymbols_en_IN');
@@ -60,6 +63,8 @@ goog.provide('goog.i18n.DateTimeSymbols_en_ZA');
 goog.provide('goog.i18n.DateTimeSymbols_es');
 goog.provide('goog.i18n.DateTimeSymbols_es_419');
 goog.provide('goog.i18n.DateTimeSymbols_es_ES');
+goog.provide('goog.i18n.DateTimeSymbols_es_MX');
+goog.provide('goog.i18n.DateTimeSymbols_es_US');
 goog.provide('goog.i18n.DateTimeSymbols_et');
 goog.provide('goog.i18n.DateTimeSymbols_eu');
 goog.provide('goog.i18n.DateTimeSymbols_fa');
@@ -118,6 +123,7 @@ goog.provide('goog.i18n.DateTimeSymbols_sk');
 goog.provide('goog.i18n.DateTimeSymbols_sl');
 goog.provide('goog.i18n.DateTimeSymbols_sq');
 goog.provide('goog.i18n.DateTimeSymbols_sr');
+goog.provide('goog.i18n.DateTimeSymbols_sr_Latn');
 goog.provide('goog.i18n.DateTimeSymbols_sv');
 goog.provide('goog.i18n.DateTimeSymbols_sw');
 goog.provide('goog.i18n.DateTimeSymbols_ta');
@@ -343,6 +349,52 @@ goog.i18n.DateTimeSymbols_az = {
 };
 
 
+/**
+ * Date/time formatting symbols for locale be.
+ */
+goog.i18n.DateTimeSymbols_be = {
+  ERAS: ['да н.э.', 'н.э.'],
+  ERANAMES: ['да н.э.', 'н.э.'],
+  NARROWMONTHS: ['с', 'л', 'с', 'к', 'м', 'ч', 'л', 'ж', 'в', 'к',
+    'л', 'с'],
+  STANDALONENARROWMONTHS: ['с', 'л', 'с', 'к', 'м', 'ч', 'л', 'ж', 'в',
+    'к', 'л', 'с'],
+  MONTHS: ['студзеня', 'лютага', 'сакавіка',
+    'красавіка', 'мая', 'чэрвеня', 'ліпеня',
+    'жніўня', 'верасня', 'кастрычніка',
+    'лістапада', 'снежня'],
+  STANDALONEMONTHS: ['студзень', 'люты', 'сакавік',
+    'красавік', 'май', 'чэрвень', 'ліпень',
+    'жнівень', 'верасень', 'кастрычнік',
+    'лістапад', 'снежань'],
+  SHORTMONTHS: ['сту', 'лют', 'сак', 'кра', 'мая', 'чэр',
+    'ліп', 'жні', 'вер', 'кас', 'ліс', 'сне'],
+  STANDALONESHORTMONTHS: ['сту', 'лют', 'сак', 'кра', 'май',
+    'чэр', 'ліп', 'жні', 'вер', 'кас', 'ліс', 'сне'],
+  WEEKDAYS: ['нядзеля', 'панядзелак', 'аўторак',
+    'серада', 'чацвер', 'пятніца', 'субота'],
+  STANDALONEWEEKDAYS: ['нядзеля', 'панядзелак',
+    'аўторак', 'серада', 'чацвер', 'пятніца',
+    'субота'],
+  SHORTWEEKDAYS: ['нд', 'пн', 'аў', 'ср', 'чц', 'пт', 'сб'],
+  STANDALONESHORTWEEKDAYS: ['нд', 'пн', 'аў', 'ср', 'чц', 'пт',
+    'сб'],
+  NARROWWEEKDAYS: ['н', 'п', 'а', 'с', 'ч', 'п', 'с'],
+  STANDALONENARROWWEEKDAYS: ['н', 'п', 'а', 'с', 'ч', 'п', 'с'],
+  SHORTQUARTERS: ['1-шы кв.', '2-гі кв.', '3-ці кв.',
+    '4-ты кв.'],
+  QUARTERS: ['1-шы квартал', '2-гі квартал',
+    '3-ці квартал', '4-ты квартал'],
+  AMPMS: ['да палудня', 'пасля палудня'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd.M.y', 'd.M.yy'],
+  TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
+  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
+  FIRSTDAYOFWEEK: 0,
+  WEEKENDRANGE: [5, 6],
+  FIRSTWEEKCUTOFFDAY: 6
+};
+
+
 /**
  * Date/time formatting symbols for locale bg.
  */
@@ -439,16 +491,10 @@ goog.i18n.DateTimeSymbols_bn = {
   NARROWWEEKDAYS: ['র', 'সো', 'ম', 'বু', 'বৃ', 'শু', 'শ'],
   STANDALONENARROWWEEKDAYS: ['র', 'সো', 'ম', 'বু', 'বৃ',
     'শু', 'শ'],
-  SHORTQUARTERS: [
-    'প্র. ত্রৈ. এক. চতুর্থাংশ',
-    'দ্বি.ত্রৈ.এক. চতুর্থাংশ',
-    'তৃ.ত্রৈ.এক.চতুর্থাংশ',
-    'চ.ত্রৈ.এক চতুর্থাংশ'],
-  QUARTERS: [
-    'প্রথম ত্রৈমাসিকের এক চতুর্থাংশ',
-    'দ্বিতীয় ত্রৈমাসিকের এক চতুর্থাংশ',
-    'তৃতীয় ত্রৈমাসিকের এক চতুর্থাংশ',
-    'চতুর্থ ত্রৈমাসিকের এক চতুর্থাংশ'],
+  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
+  QUARTERS: ['ত্রৈমাসিক', 'ষাণ্মাসিক',
+    'তৃতীয় চতুর্থাংশ',
+    'চতুর্থ ত্রৈমাসিক'],
   AMPMS: ['am', 'pm'],
   DATEFORMATS: ['EEEE, d MMMM, y', 'd MMMM, y', 'd MMM, y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
@@ -497,6 +543,44 @@ goog.i18n.DateTimeSymbols_br = {
 };
 
 
+/**
+ * Date/time formatting symbols for locale bs.
+ */
+goog.i18n.DateTimeSymbols_bs = {
+  ERAS: ['p. n. e.', 'n. e.'],
+  ERANAMES: ['Prije nove ere', 'Nove ere'],
+  NARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  STANDALONENARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o',
+    'n', 'd'],
+  MONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'juni', 'juli',
+    'august', 'septembar', 'oktobar', 'novembar', 'decembar'],
+  STANDALONEMONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'juni',
+    'juli', 'august', 'septembar', 'oktobar', 'novembar', 'decembar'],
+  SHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep',
+    'okt', 'nov', 'dec'],
+  STANDALONESHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul',
+    'aug', 'sep', 'okt', 'nov', 'dec'],
+  WEEKDAYS: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda', 'četvrtak',
+    'petak', 'subota'],
+  STANDALONEWEEKDAYS: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda',
+    'četvrtak', 'petak', 'subota'],
+  SHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
+  STANDALONESHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
+  NARROWWEEKDAYS: ['N', 'P', 'U', 'S', 'Č', 'P', 'S'],
+  STANDALONENARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
+  SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
+  QUARTERS: ['Prvi kvartal', 'Drugi kvartal', 'Treći kvartal',
+    'Četvrti kvartal'],
+  AMPMS: ['prije podne', 'popodne'],
+  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd. MMM. y.', 'dd.MM.yy.'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  DATETIMEFORMATS: ['{1} \'u\' {0}', '{1} \'u\' {0}', '{1} {0}', '{1} {0}'],
+  FIRSTDAYOFWEEK: 0,
+  WEEKENDRANGE: [5, 6],
+  FIRSTWEEKCUTOFFDAY: 6
+};
+
+
 /**
  * Date/time formatting symbols for locale ca.
  */
@@ -507,8 +591,9 @@ goog.i18n.DateTimeSymbols_ca = {
     'NV', 'DS'],
   STANDALONENARROWMONTHS: ['GN', 'FB', 'MÇ', 'AB', 'MG', 'JN', 'JL', 'AG',
     'ST', 'OC', 'NV', 'DS'],
-  MONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny', 'juliol',
-    'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
+  MONTHS: ['de gener', 'de febrer', 'de març', 'd’abril', 'de maig',
+    'de juny', 'de juliol', 'd’agost', 'de setembre', 'd’octubre',
+    'de novembre', 'de desembre'],
   STANDALONEMONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny',
     'juliol', 'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
   SHORTMONTHS: ['gen.', 'febr.', 'març', 'abr.', 'maig', 'juny', 'jul.', 'ag.',
@@ -609,7 +694,7 @@ goog.i18n.DateTimeSymbols_cs = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1. čtvrtletí', '2. čtvrtletí', '3. čtvrtletí',
     '4. čtvrtletí'],
-  AMPMS: ['AM', 'PM'],
+  AMPMS: ['dopoledne', 'odpoledne'],
   DATEFORMATS: ['EEEE d. MMMM y', 'd. MMMM y', 'd. M. y', 'dd.MM.yy'],
   TIMEFORMATS: ['H:mm:ss zzzz', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
@@ -684,7 +769,7 @@ goog.i18n.DateTimeSymbols_da = {
   SHORTQUARTERS: ['1. kvt.', '2. kvt.', '3. kvt.', '4. kvt.'],
   QUARTERS: ['1. kvartal', '2. kvartal', '3. kvartal', '4. kvartal'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE \'den\' d. MMMM y', 'd. MMMM y', 'dd/MM/y', 'dd/MM/yy'],
+  DATEFORMATS: ['EEEE \'den\' d. MMMM y', 'd. MMMM y', 'd. MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
   DATETIMEFORMATS: ['{1} \'kl.\' {0}', '{1} \'kl.\' {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -758,7 +843,7 @@ goog.i18n.DateTimeSymbols_de_AT = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1. Quartal', '2. Quartal', '3. Quartal', '4. Quartal'],
   AMPMS: ['vorm.', 'nachm.'],
-  DATEFORMATS: ['EEEE, dd. MMMM y', 'dd. MMMM y', 'dd. MMM y', 'dd.MM.yy'],
+  DATEFORMATS: ['EEEE, d. MMMM y', 'd. MMMM y', 'dd.MM.y', 'dd.MM.yy'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} \'um\' {0}', '{1} \'um\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -882,10 +967,47 @@ goog.i18n.DateTimeSymbols_en_AU = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
+  DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
+  FIRSTDAYOFWEEK: 6,
+  WEEKENDRANGE: [5, 6],
+  FIRSTWEEKCUTOFFDAY: 5
+};
+
+
+/**
+ * Date/time formatting symbols for locale en_CA.
+ */
+goog.i18n.DateTimeSymbols_en_CA = {
+  ERAS: ['BC', 'AD'],
+  ERANAMES: ['Before Christ', 'Anno Domini'],
+  NARROWMONTHS: ['J', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
+  STANDALONENARROWMONTHS: ['J', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
+    'N', 'D'],
+  MONTHS: ['January', 'February', 'March', 'April', 'May', 'June', 'July',
+    'August', 'September', 'October', 'November', 'December'],
+  STANDALONEMONTHS: ['January', 'February', 'March', 'April', 'May', 'June',
+    'July', 'August', 'September', 'October', 'November', 'December'],
+  SHORTMONTHS: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
+    'Oct', 'Nov', 'Dec'],
+  STANDALONESHORTMONTHS: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul',
+    'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+  WEEKDAYS: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday',
+    'Saturday'],
+  STANDALONEWEEKDAYS: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday',
+    'Friday', 'Saturday'],
+  SHORTWEEKDAYS: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+  STANDALONESHORTWEEKDAYS: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
+  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
+  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
+  QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
+  AMPMS: ['AM', 'PM'],
+  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'y-MM-dd'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
+  DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
   FIRSTWEEKCUTOFFDAY: 5
@@ -919,7 +1041,7 @@ goog.i18n.DateTimeSymbols_en_GB = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['a.m.', 'p.m.'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
@@ -958,7 +1080,7 @@ goog.i18n.DateTimeSymbols_en_IE = {
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['a.m.', 'p.m.'],
   DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -993,7 +1115,7 @@ goog.i18n.DateTimeSymbols_en_IN = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'dd-MMM-y', 'dd/MM/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
@@ -1030,7 +1152,7 @@ goog.i18n.DateTimeSymbols_en_SG = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
@@ -1074,7 +1196,7 @@ goog.i18n.DateTimeSymbols_en_ZA = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE dd MMMM y', 'dd MMMM y', 'dd MMM y', 'y/MM/dd'],
+  DATEFORMATS: ['EEEE, dd MMMM y', 'dd MMMM y', 'dd MMM y', 'y/MM/dd'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -1088,7 +1210,7 @@ goog.i18n.DateTimeSymbols_en_ZA = {
  */
 goog.i18n.DateTimeSymbols_es = {
   ERAS: ['a. C.', 'd. C.'],
-  ERANAMES: ['antes de Cristo', 'anno Dómini'],
+  ERANAMES: ['antes de Cristo', 'después de Cristo'],
   NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
@@ -1114,7 +1236,7 @@ goog.i18n.DateTimeSymbols_es = {
     '4.º trimestre'],
   AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['H:mm:ss (zzzz)', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -1129,17 +1251,17 @@ goog.i18n.DateTimeSymbols_es = {
 goog.i18n.DateTimeSymbols_es_419 = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -1149,12 +1271,12 @@ goog.i18n.DateTimeSymbols_es_419 = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -1169,6 +1291,86 @@ goog.i18n.DateTimeSymbols_es_419 = {
 goog.i18n.DateTimeSymbols_es_ES = goog.i18n.DateTimeSymbols_es;
 
 
+/**
+ * Date/time formatting symbols for locale es_MX.
+ */
+goog.i18n.DateTimeSymbols_es_MX = {
+  ERAS: ['a. C.', 'd. C.'],
+  ERANAMES: ['antes de Cristo', 'después de Cristo'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
+  STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
+    'N', 'D'],
+  MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
+  STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+  SHORTMONTHS: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep',
+    'oct', 'nov', 'dic'],
+  STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
+  WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
+    'sábado'],
+  STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
+    'Viernes', 'Sábado'],
+  SHORTWEEKDAYS: ['dom.', 'lun.', 'mar.', 'mié.', 'jue.', 'vie.', 'sáb.'],
+  STANDALONESHORTWEEKDAYS: ['Dom.', 'Lun.', 'Mar.', 'Mié.', 'Jue.', 'Vie.',
+    'Sáb.'],
+  NARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
+  STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
+  SHORTQUARTERS: ['1er. trim.', '2º. trim.', '3er. trim.', '4º trim.'],
+  QUARTERS: ['1er. trimestre', '2º. trimestre', '3er. trimestre',
+    '4º trimestre'],
+  AMPMS: ['a.m.', 'p.m.'],
+  DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
+    'dd/MM/y', 'dd/MM/yy'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
+  DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
+  FIRSTDAYOFWEEK: 6,
+  WEEKENDRANGE: [5, 6],
+  FIRSTWEEKCUTOFFDAY: 5
+};
+
+
+/**
+ * Date/time formatting symbols for locale es_US.
+ */
+goog.i18n.DateTimeSymbols_es_US = {
+  ERAS: ['a. C.', 'd. C.'],
+  ERANAMES: ['antes de Cristo', 'después de Cristo'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
+  STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
+    'N', 'D'],
+  MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
+  STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+  SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
+    'sept.', 'oct.', 'nov.', 'dic.'],
+  STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
+  WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
+    'sábado'],
+  STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
+    'Viernes', 'Sábado'],
+  SHORTWEEKDAYS: ['dom.', 'lun.', 'mar.', 'mié.', 'jue.', 'vie.', 'sáb.'],
+  STANDALONESHORTWEEKDAYS: ['Dom.', 'Lun.', 'Mar.', 'Mié.', 'Jue.', 'Vie.',
+    'Sáb.'],
+  NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
+  STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
+  QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
+    '4.º trimestre'],
+  AMPMS: ['AM', 'PM'],
+  DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
+    'd MMM y', 'd/M/yy'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
+  DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
+  FIRSTDAYOFWEEK: 6,
+  WEEKENDRANGE: [5, 6],
+  FIRSTWEEKCUTOFFDAY: 5
+};
+
+
 /**
  * Date/time formatting symbols for locale et.
  */
@@ -1327,7 +1529,8 @@ goog.i18n.DateTimeSymbols_fi = {
   AMPMS: ['ap.', 'ip.'],
   DATEFORMATS: ['cccc d. MMMM y', 'd. MMMM y', 'd.M.y', 'd.M.y'],
   TIMEFORMATS: ['H.mm.ss zzzz', 'H.mm.ss z', 'H.mm.ss', 'H.mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
+  DATETIMEFORMATS: ['{1} \'klo\' {0}', '{1} \'klo\' {0}', '{1} \'klo\' {0}',
+    '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
   FIRSTWEEKCUTOFFDAY: 3
@@ -1440,10 +1643,9 @@ goog.i18n.DateTimeSymbols_fr_CA = {
   SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1er trimestre', '2e trimestre', '3e trimestre', '4e trimestre'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'y-MM-dd', 'yy-MM-dd'],
-  TIMEFORMATS: ['HH \'h\' mm \'min\' ss \'s\' zzzz', 'HH:mm:ss z', 'HH:mm:ss',
-    'HH:mm'],
-  DATETIMEFORMATS: ['{1} \'à\' {0}', '{1} \'à\' {0}', '{1} {0}', '{1} {0}'],
+  DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'd MMM y', 'yy-MM-dd'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
   FIRSTWEEKCUTOFFDAY: 5
@@ -1697,7 +1899,7 @@ goog.i18n.DateTimeSymbols_he = {
   QUARTERS: ['רבעון 1', 'רבעון 2', 'רבעון 3', 'רבעון 4'],
   AMPMS: ['לפנה״צ', 'אחה״צ'],
   DATEFORMATS: ['EEEE, d בMMMM y', 'd בMMMM y', 'd בMMM y', 'd.M.y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['H:mm:ss zzzz', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1} בשעה {0}', '{1} בשעה {0}', '{1}, {0}',
     '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -2073,7 +2275,7 @@ goog.i18n.DateTimeSymbols_iw = {
   QUARTERS: ['רבעון 1', 'רבעון 2', 'רבעון 3', 'רבעון 4'],
   AMPMS: ['לפנה״צ', 'אחה״צ'],
   DATEFORMATS: ['EEEE, d בMMMM y', 'd בMMMM y', 'd בMMM y', 'd.M.y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['H:mm:ss zzzz', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1} בשעה {0}', '{1} בשעה {0}', '{1}, {0}',
     '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -2941,7 +3143,7 @@ goog.i18n.DateTimeSymbols_my = {
     'တတိယ သုံးလပတ်',
     'စတုတ္ထ သုံးလပတ်'],
   AMPMS: ['နံနက်', 'ညနေ'],
-  DATEFORMATS: ['EEEE, dd MMMM y', 'd MMMM y', 'd MMM y', 'dd-MM-yy'],
+  DATEFORMATS: ['EEEE၊ dd MMMM y', 'd MMMM y', 'd MMM y', 'dd-MM-yy'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1}မှာ {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -2999,7 +3201,7 @@ goog.i18n.DateTimeSymbols_ne = {
   STANDALONENARROWMONTHS: ['१', '२', '३', '४', '५', '६', '७',
     '८', '९', '१०', '११', '१२'],
   MONTHS: ['जनवरी', 'फेब्रुअरी', 'मार्च',
-    'अप्रिल', 'मे', 'जुन', 'जुलाई',
+    'अप्रिल', 'मई', 'जुन', 'जुलाई',
     'अगस्ट', 'सेप्टेम्बर',
     'अक्टोबर', 'नोभेम्बर',
     'डिसेम्बर'],
@@ -3019,10 +3221,10 @@ goog.i18n.DateTimeSymbols_ne = {
     'अक्टोबर', 'नोभेम्बर',
     'डिसेम्बर'],
   WEEKDAYS: ['आइतबार', 'सोमबार',
-    'मङ्गलबार', 'बुधबार', 'बिहीबार',
+    'मङ्गलबार', 'बुधबार', 'बिहिबार',
     'शुक्रबार', 'शनिबार'],
   STANDALONEWEEKDAYS: ['आइतबार', 'सोमबार',
-    'मङ्गलबार', 'बुधबार', 'बिहीबार',
+    'मङ्गलबार', 'बुधबार', 'बिहिबार',
     'शुक्रबार', 'शनिबार'],
   SHORTWEEKDAYS: ['आइत', 'सोम', 'मङ्गल', 'बुध',
     'बिही', 'शुक्र', 'शनि'],
@@ -3036,8 +3238,7 @@ goog.i18n.DateTimeSymbols_ne = {
     'चौथो सत्र'],
   QUARTERS: ['पहिलो सत्र', 'दोस्रो सत्र',
     'तेस्रो सत्र', 'चौथो सत्र'],
-  AMPMS: ['पूर्व मध्यान्ह',
-    'उत्तर मध्यान्ह'],
+  AMPMS: ['पूर्वाह्न', 'अपराह्न'],
   DATEFORMATS: ['y MMMM d, EEEE', 'y MMMM d', 'y MMM d', 'y-MM-dd'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1}, {0}', '{1}, {0}'],
@@ -3265,7 +3466,7 @@ goog.i18n.DateTimeSymbols_pl = {
   SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
   QUARTERS: ['I kwartał', 'II kwartał', 'III kwartał', 'IV kwartał'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd.MM.y'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'dd.MM.y', 'dd.MM.y'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -3330,12 +3531,12 @@ goog.i18n.DateTimeSymbols_pt_PT = {
     'N', 'D'],
   MONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho',
     'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  STANDALONEMONTHS: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
-    'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  STANDALONEMONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho',
+    'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
   SHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set',
     'out', 'nov', 'dez'],
-  STANDALONESHORTMONTHS: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul',
-    'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+  STANDALONESHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul',
+    'ago', 'set', 'out', 'nov', 'dez'],
   WEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira', 'quarta-feira',
     'quinta-feira', 'sexta-feira', 'sábado'],
   STANDALONEWEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira',
@@ -3570,7 +3771,7 @@ goog.i18n.DateTimeSymbols_sl = {
     '4. četrtletje'],
   AMPMS: ['dop.', 'pop.'],
   DATEFORMATS: ['EEEE, dd. MMMM y', 'dd. MMMM y', 'd. MMM y', 'd. MM. yy'],
-  TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -3661,6 +3862,44 @@ goog.i18n.DateTimeSymbols_sr = {
 };
 
 
+/**
+ * Date/time formatting symbols for locale sr_Latn.
+ */
+goog.i18n.DateTimeSymbols_sr_Latn = {
+  ERAS: ['p. n. e.', 'n. e.'],
+  ERANAMES: ['Pre nove ere', 'Nove ere'],
+  NARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  STANDALONENARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o',
+    'n', 'd'],
+  MONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust',
+    'septembar', 'oktobar', 'novembar', 'decembar'],
+  STANDALONEMONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul',
+    'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+  SHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'avg', 'sep',
+    'okt', 'nov', 'dec'],
+  STANDALONESHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul',
+    'avg', 'sep', 'okt', 'nov', 'dec'],
+  WEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak', 'petak',
+    'subota'],
+  STANDALONEWEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak',
+    'petak', 'subota'],
+  SHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sre', 'čet', 'pet', 'sub'],
+  STANDALONESHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sre', 'čet', 'pet', 'sub'],
+  NARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
+  STANDALONENARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
+  SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
+  QUARTERS: ['Prvo tromesečje', 'Drugo tromesečje', 'Treće tromesečje',
+    'Četvrto tromesečje'],
+  AMPMS: ['pre podne', 'po podne'],
+  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd.MM.y.', 'd.M.yy.'],
+  TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
+  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
+  FIRSTDAYOFWEEK: 0,
+  WEEKENDRANGE: [5, 6],
+  FIRSTWEEKCUTOFFDAY: 6
+};
+
+
 /**
  * Date/time formatting symbols for locale sv.
  */
@@ -3726,7 +3965,7 @@ goog.i18n.DateTimeSymbols_sw = {
     'Alhamisi', 'Ijumaa', 'Jumamosi'],
   NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
+  SHORTQUARTERS: ['R1', 'R2', 'R3', 'R4'],
   QUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
   AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
@@ -4189,7 +4428,7 @@ goog.i18n.DateTimeSymbols_zh = {
   QUARTERS: ['第一季度', '第二季度', '第三季度', '第四季度'],
   AMPMS: ['上午', '下午'],
   DATEFORMATS: ['y年M月d日EEEE', 'y年M月d日', 'y年M月d日', 'yy/M/d'],
-  TIMEFORMATS: ['zzzzah:mm:ss', 'zah:mm:ss', 'ah:mm:ss', 'ah:mm'],
+  TIMEFORMATS: ['zzzz ah:mm:ss', 'z ah:mm:ss', 'ah:mm:ss', 'ah:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -4330,12 +4569,16 @@ if (goog.LOCALE == 'af') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ar;
 } else if (goog.LOCALE == 'az') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_az;
+} else if (goog.LOCALE == 'be') {
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_be;
 } else if (goog.LOCALE == 'bg') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bg;
 } else if (goog.LOCALE == 'bn') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bn;
 } else if (goog.LOCALE == 'br') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_br;
+} else if (goog.LOCALE == 'bs') {
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bs;
 } else if (goog.LOCALE == 'ca') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ca;
 } else if (goog.LOCALE == 'chr') {
@@ -4358,6 +4601,8 @@ if (goog.LOCALE == 'af') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en;
 } else if (goog.LOCALE == 'en_AU' || goog.LOCALE == 'en-AU') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en_AU;
+} else if (goog.LOCALE == 'en_CA' || goog.LOCALE == 'en-CA') {
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en_CA;
 } else if (goog.LOCALE == 'en_GB' || goog.LOCALE == 'en-GB') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en_GB;
 } else if (goog.LOCALE == 'en_IE' || goog.LOCALE == 'en-IE') {
@@ -4376,6 +4621,10 @@ if (goog.LOCALE == 'af') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_419;
 } else if (goog.LOCALE == 'es_ES' || goog.LOCALE == 'es-ES') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es;
+} else if (goog.LOCALE == 'es_MX' || goog.LOCALE == 'es-MX') {
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_MX;
+} else if (goog.LOCALE == 'es_US' || goog.LOCALE == 'es-US') {
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_US;
 } else if (goog.LOCALE == 'et') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_et;
 } else if (goog.LOCALE == 'eu') {
@@ -4492,6 +4741,8 @@ if (goog.LOCALE == 'af') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sq;
 } else if (goog.LOCALE == 'sr') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr;
+} else if (goog.LOCALE == 'sr_Latn' || goog.LOCALE == 'sr-Latn') {
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn;
 } else if (goog.LOCALE == 'sv') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sv;
 } else if (goog.LOCALE == 'sw') {
diff --git a/i18n/closure/datetimeSymbolsExt.js b/i18n/closure/datetimeSymbolsExt.js
index e6dda8f03494..af915496a06f 100644
--- a/i18n/closure/datetimeSymbolsExt.js
+++ b/i18n/closure/datetimeSymbolsExt.js
@@ -17,7 +17,7 @@
  *
  * This file is autogenerated by scripts
  *   i18n/tools/generate_datetime_constants.py --for_closure
- * File generated from CLDR ver. 26
+ * File generated from CLDR ver. 27.0.1
  *
  * This file contains symbols for locales that are not covered by
  * datetimesymbols.js.
@@ -28,10 +28,6 @@
  */
 
 goog.provide('goog.i18n.DateTimeSymbolsExt');
-goog.provide('goog.i18n.DateTimeSymbols_aa');
-goog.provide('goog.i18n.DateTimeSymbols_aa_DJ');
-goog.provide('goog.i18n.DateTimeSymbols_aa_ER');
-goog.provide('goog.i18n.DateTimeSymbols_aa_ET');
 goog.provide('goog.i18n.DateTimeSymbols_af_NA');
 goog.provide('goog.i18n.DateTimeSymbols_af_ZA');
 goog.provide('goog.i18n.DateTimeSymbols_agq');
@@ -79,7 +75,6 @@ goog.provide('goog.i18n.DateTimeSymbols_az_Latn');
 goog.provide('goog.i18n.DateTimeSymbols_az_Latn_AZ');
 goog.provide('goog.i18n.DateTimeSymbols_bas');
 goog.provide('goog.i18n.DateTimeSymbols_bas_CM');
-goog.provide('goog.i18n.DateTimeSymbols_be');
 goog.provide('goog.i18n.DateTimeSymbols_be_BY');
 goog.provide('goog.i18n.DateTimeSymbols_bem');
 goog.provide('goog.i18n.DateTimeSymbols_bem_ZM');
@@ -97,7 +92,6 @@ goog.provide('goog.i18n.DateTimeSymbols_bo_IN');
 goog.provide('goog.i18n.DateTimeSymbols_br_FR');
 goog.provide('goog.i18n.DateTimeSymbols_brx');
 goog.provide('goog.i18n.DateTimeSymbols_brx_IN');
-goog.provide('goog.i18n.DateTimeSymbols_bs');
 goog.provide('goog.i18n.DateTimeSymbols_bs_Cyrl');
 goog.provide('goog.i18n.DateTimeSymbols_bs_Cyrl_BA');
 goog.provide('goog.i18n.DateTimeSymbols_bs_Latn');
@@ -156,7 +150,6 @@ goog.provide('goog.i18n.DateTimeSymbols_en_BM');
 goog.provide('goog.i18n.DateTimeSymbols_en_BS');
 goog.provide('goog.i18n.DateTimeSymbols_en_BW');
 goog.provide('goog.i18n.DateTimeSymbols_en_BZ');
-goog.provide('goog.i18n.DateTimeSymbols_en_CA');
 goog.provide('goog.i18n.DateTimeSymbols_en_CC');
 goog.provide('goog.i18n.DateTimeSymbols_en_CK');
 goog.provide('goog.i18n.DateTimeSymbols_en_CM');
@@ -246,7 +239,6 @@ goog.provide('goog.i18n.DateTimeSymbols_es_GQ');
 goog.provide('goog.i18n.DateTimeSymbols_es_GT');
 goog.provide('goog.i18n.DateTimeSymbols_es_HN');
 goog.provide('goog.i18n.DateTimeSymbols_es_IC');
-goog.provide('goog.i18n.DateTimeSymbols_es_MX');
 goog.provide('goog.i18n.DateTimeSymbols_es_NI');
 goog.provide('goog.i18n.DateTimeSymbols_es_PA');
 goog.provide('goog.i18n.DateTimeSymbols_es_PE');
@@ -254,7 +246,6 @@ goog.provide('goog.i18n.DateTimeSymbols_es_PH');
 goog.provide('goog.i18n.DateTimeSymbols_es_PR');
 goog.provide('goog.i18n.DateTimeSymbols_es_PY');
 goog.provide('goog.i18n.DateTimeSymbols_es_SV');
-goog.provide('goog.i18n.DateTimeSymbols_es_US');
 goog.provide('goog.i18n.DateTimeSymbols_es_UY');
 goog.provide('goog.i18n.DateTimeSymbols_es_VE');
 goog.provide('goog.i18n.DateTimeSymbols_et_EE');
@@ -347,8 +338,6 @@ goog.provide('goog.i18n.DateTimeSymbols_hsb');
 goog.provide('goog.i18n.DateTimeSymbols_hsb_DE');
 goog.provide('goog.i18n.DateTimeSymbols_hu_HU');
 goog.provide('goog.i18n.DateTimeSymbols_hy_AM');
-goog.provide('goog.i18n.DateTimeSymbols_ia');
-goog.provide('goog.i18n.DateTimeSymbols_ia_FR');
 goog.provide('goog.i18n.DateTimeSymbols_id_ID');
 goog.provide('goog.i18n.DateTimeSymbols_ig');
 goog.provide('goog.i18n.DateTimeSymbols_ig_NG');
@@ -471,10 +460,6 @@ goog.provide('goog.i18n.DateTimeSymbols_nn');
 goog.provide('goog.i18n.DateTimeSymbols_nn_NO');
 goog.provide('goog.i18n.DateTimeSymbols_nnh');
 goog.provide('goog.i18n.DateTimeSymbols_nnh_CM');
-goog.provide('goog.i18n.DateTimeSymbols_nr');
-goog.provide('goog.i18n.DateTimeSymbols_nr_ZA');
-goog.provide('goog.i18n.DateTimeSymbols_nso');
-goog.provide('goog.i18n.DateTimeSymbols_nso_ZA');
 goog.provide('goog.i18n.DateTimeSymbols_nus');
 goog.provide('goog.i18n.DateTimeSymbols_nus_SD');
 goog.provide('goog.i18n.DateTimeSymbols_nyn');
@@ -563,24 +548,17 @@ goog.provide('goog.i18n.DateTimeSymbols_sr_Cyrl_BA');
 goog.provide('goog.i18n.DateTimeSymbols_sr_Cyrl_ME');
 goog.provide('goog.i18n.DateTimeSymbols_sr_Cyrl_RS');
 goog.provide('goog.i18n.DateTimeSymbols_sr_Cyrl_XK');
-goog.provide('goog.i18n.DateTimeSymbols_sr_Latn');
 goog.provide('goog.i18n.DateTimeSymbols_sr_Latn_BA');
 goog.provide('goog.i18n.DateTimeSymbols_sr_Latn_ME');
 goog.provide('goog.i18n.DateTimeSymbols_sr_Latn_RS');
 goog.provide('goog.i18n.DateTimeSymbols_sr_Latn_XK');
-goog.provide('goog.i18n.DateTimeSymbols_ss');
-goog.provide('goog.i18n.DateTimeSymbols_ss_SZ');
-goog.provide('goog.i18n.DateTimeSymbols_ss_ZA');
-goog.provide('goog.i18n.DateTimeSymbols_ssy');
-goog.provide('goog.i18n.DateTimeSymbols_ssy_ER');
 goog.provide('goog.i18n.DateTimeSymbols_sv_AX');
 goog.provide('goog.i18n.DateTimeSymbols_sv_FI');
 goog.provide('goog.i18n.DateTimeSymbols_sv_SE');
+goog.provide('goog.i18n.DateTimeSymbols_sw_CD');
 goog.provide('goog.i18n.DateTimeSymbols_sw_KE');
 goog.provide('goog.i18n.DateTimeSymbols_sw_TZ');
 goog.provide('goog.i18n.DateTimeSymbols_sw_UG');
-goog.provide('goog.i18n.DateTimeSymbols_swc');
-goog.provide('goog.i18n.DateTimeSymbols_swc_CD');
 goog.provide('goog.i18n.DateTimeSymbols_ta_IN');
 goog.provide('goog.i18n.DateTimeSymbols_ta_LK');
 goog.provide('goog.i18n.DateTimeSymbols_ta_MY');
@@ -593,15 +571,10 @@ goog.provide('goog.i18n.DateTimeSymbols_th_TH');
 goog.provide('goog.i18n.DateTimeSymbols_ti');
 goog.provide('goog.i18n.DateTimeSymbols_ti_ER');
 goog.provide('goog.i18n.DateTimeSymbols_ti_ET');
-goog.provide('goog.i18n.DateTimeSymbols_tn');
-goog.provide('goog.i18n.DateTimeSymbols_tn_BW');
-goog.provide('goog.i18n.DateTimeSymbols_tn_ZA');
 goog.provide('goog.i18n.DateTimeSymbols_to');
 goog.provide('goog.i18n.DateTimeSymbols_to_TO');
 goog.provide('goog.i18n.DateTimeSymbols_tr_CY');
 goog.provide('goog.i18n.DateTimeSymbols_tr_TR');
-goog.provide('goog.i18n.DateTimeSymbols_ts');
-goog.provide('goog.i18n.DateTimeSymbols_ts_ZA');
 goog.provide('goog.i18n.DateTimeSymbols_twq');
 goog.provide('goog.i18n.DateTimeSymbols_twq_NE');
 goog.provide('goog.i18n.DateTimeSymbols_tzm');
@@ -624,11 +597,7 @@ goog.provide('goog.i18n.DateTimeSymbols_vai_Latn');
 goog.provide('goog.i18n.DateTimeSymbols_vai_Latn_LR');
 goog.provide('goog.i18n.DateTimeSymbols_vai_Vaii');
 goog.provide('goog.i18n.DateTimeSymbols_vai_Vaii_LR');
-goog.provide('goog.i18n.DateTimeSymbols_ve');
-goog.provide('goog.i18n.DateTimeSymbols_ve_ZA');
 goog.provide('goog.i18n.DateTimeSymbols_vi_VN');
-goog.provide('goog.i18n.DateTimeSymbols_vo');
-goog.provide('goog.i18n.DateTimeSymbols_vo_001');
 goog.provide('goog.i18n.DateTimeSymbols_vun');
 goog.provide('goog.i18n.DateTimeSymbols_vun_TZ');
 goog.provide('goog.i18n.DateTimeSymbols_wae');
@@ -657,96 +626,6 @@ goog.provide('goog.i18n.DateTimeSymbols_zu_ZA');
 
 goog.require('goog.i18n.DateTimeSymbols');
 
-/**
- * Date/time formatting symbols for locale aa.
- */
-goog.i18n.DateTimeSymbols_aa = {
-  ERAS: ['Yaasuusuk Duma', 'Yaasuusuk Wadir'],
-  ERANAMES: ['Yaasuusuk Duma', 'Yaasuusuk Wadir'],
-  NARROWMONTHS: ['Q', 'N', 'C', 'A', 'C', 'Q', 'Q', 'L', 'W', 'D', 'X', 'K'],
-  STANDALONENARROWMONTHS: ['Q', 'N', 'C', 'A', 'C', 'Q', 'Q', 'L', 'W', 'D',
-    'X', 'K'],
-  MONTHS: ['Qunxa Garablu', 'Kudo', 'Ciggilta Kudo', 'Agda Baxis', 'Caxah Alsa',
-    'Qasa Dirri', 'Qado Dirri', 'Liiqen', 'Waysu', 'Diteli', 'Ximoli',
-    'Kaxxa Garablu'],
-  STANDALONEMONTHS: ['Qunxa Garablu', 'Kudo', 'Ciggilta Kudo', 'Agda Baxis',
-    'Caxah Alsa', 'Qasa Dirri', 'Qado Dirri', 'Liiqen', 'Waysu', 'Diteli',
-    'Ximoli', 'Kaxxa Garablu'],
-  SHORTMONTHS: ['Qun', 'Nah', 'Cig', 'Agd', 'Cax', 'Qas', 'Qad', 'Leq', 'Way',
-    'Dit', 'Xim', 'Kax'],
-  STANDALONESHORTMONTHS: ['Qun', 'Nah', 'Cig', 'Agd', 'Cax', 'Qas', 'Qad',
-    'Leq', 'Way', 'Dit', 'Xim', 'Kax'],
-  WEEKDAYS: ['Acaada', 'Etleeni', 'Talaata', 'Arbaqa', 'Kamiisi', 'Gumqata',
-    'Sabti'],
-  STANDALONEWEEKDAYS: ['Acaada', 'Etleeni', 'Talaata', 'Arbaqa', 'Kamiisi',
-    'Gumqata', 'Sabti'],
-  SHORTWEEKDAYS: ['Aca', 'Etl', 'Tal', 'Arb', 'Kam', 'Gum', 'Sab'],
-  STANDALONESHORTWEEKDAYS: ['Aca', 'Etl', 'Tal', 'Arb', 'Kam', 'Gum', 'Sab'],
-  NARROWWEEKDAYS: ['A', 'E', 'T', 'A', 'K', 'G', 'S'],
-  STANDALONENARROWWEEKDAYS: ['A', 'E', 'T', 'A', 'K', 'G', 'S'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  QUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  AMPMS: ['saaku', 'carra'],
-  DATEFORMATS: ['EEEE, MMMM dd, y', 'dd MMMM y', 'dd-MMM-y', 'dd/MM/yy'],
-  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 0,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 6
-};
-
-
-/**
- * Date/time formatting symbols for locale aa_DJ.
- */
-goog.i18n.DateTimeSymbols_aa_DJ = {
-  ERAS: ['Yaasuusuk Duma', 'Yaasuusuk Wadir'],
-  ERANAMES: ['Yaasuusuk Duma', 'Yaasuusuk Wadir'],
-  NARROWMONTHS: ['Q', 'N', 'C', 'A', 'C', 'Q', 'Q', 'L', 'W', 'D', 'X', 'K'],
-  STANDALONENARROWMONTHS: ['Q', 'N', 'C', 'A', 'C', 'Q', 'Q', 'L', 'W', 'D',
-    'X', 'K'],
-  MONTHS: ['Qunxa Garablu', 'Kudo', 'Ciggilta Kudo', 'Agda Baxis', 'Caxah Alsa',
-    'Qasa Dirri', 'Qado Dirri', 'Leqeeni', 'Waysu', 'Diteli', 'Ximoli',
-    'Kaxxa Garablu'],
-  STANDALONEMONTHS: ['Qunxa Garablu', 'Kudo', 'Ciggilta Kudo', 'Agda Baxis',
-    'Caxah Alsa', 'Qasa Dirri', 'Qado Dirri', 'Leqeeni', 'Waysu', 'Diteli',
-    'Ximoli', 'Kaxxa Garablu'],
-  SHORTMONTHS: ['Qun', 'Nah', 'Cig', 'Agd', 'Cax', 'Qas', 'Qad', 'Leq', 'Way',
-    'Dit', 'Xim', 'Kax'],
-  STANDALONESHORTMONTHS: ['Qun', 'Nah', 'Cig', 'Agd', 'Cax', 'Qas', 'Qad',
-    'Leq', 'Way', 'Dit', 'Xim', 'Kax'],
-  WEEKDAYS: ['Acaada', 'Etleeni', 'Talaata', 'Arbaqa', 'Kamiisi', 'Gumqata',
-    'Sabti'],
-  STANDALONEWEEKDAYS: ['Acaada', 'Etleeni', 'Talaata', 'Arbaqa', 'Kamiisi',
-    'Gumqata', 'Sabti'],
-  SHORTWEEKDAYS: ['Aca', 'Etl', 'Tal', 'Arb', 'Kam', 'Gum', 'Sab'],
-  STANDALONESHORTWEEKDAYS: ['Aca', 'Etl', 'Tal', 'Arb', 'Kam', 'Gum', 'Sab'],
-  NARROWWEEKDAYS: ['A', 'E', 'T', 'A', 'K', 'G', 'S'],
-  STANDALONENARROWWEEKDAYS: ['A', 'E', 'T', 'A', 'K', 'G', 'S'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  QUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  AMPMS: ['saaku', 'carra'],
-  DATEFORMATS: ['EEEE, MMMM dd, y', 'dd MMMM y', 'dd-MMM-y', 'dd/MM/yy'],
-  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 5,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 4
-};
-
-
-/**
- * Date/time formatting symbols for locale aa_ER.
- */
-goog.i18n.DateTimeSymbols_aa_ER = goog.i18n.DateTimeSymbols_aa;
-
-
-/**
- * Date/time formatting symbols for locale aa_ET.
- */
-goog.i18n.DateTimeSymbols_aa_ET = goog.i18n.DateTimeSymbols_aa;
-
-
 /**
  * Date/time formatting symbols for locale af_NA.
  */
@@ -1194,7 +1073,8 @@ goog.i18n.DateTimeSymbols_ar_DZ = {
   QUARTERS: ['الربع الأول', 'الربع الثاني',
     'الربع الثالث', 'الربع الرابع'],
   AMPMS: ['ص', 'م'],
-  DATEFORMATS: ['EEEE، d MMMM، y', 'd MMMM، y', 'y/MM/dd', 'y/M/d'],
+  DATEFORMATS: ['EEEE، d MMMM، y', 'd MMMM، y', 'dd‏/MM‏/y',
+    'd‏/M‏/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 5,
@@ -1636,7 +1516,8 @@ goog.i18n.DateTimeSymbols_ar_LB = {
   QUARTERS: ['الربع الأول', 'الربع الثاني',
     'الربع الثالث', 'الربع الرابع'],
   AMPMS: ['ص', 'م'],
-  DATEFORMATS: ['EEEE، d MMMM، y', 'd MMMM، y', 'MMM d, y', 'd‏/M‏/y'],
+  DATEFORMATS: ['EEEE، d MMMM، y', 'd MMMM، y', 'dd‏/MM‏/y',
+    'd‏/M‏/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -1729,7 +1610,8 @@ goog.i18n.DateTimeSymbols_ar_MA = {
   QUARTERS: ['الربع الأول', 'الربع الثاني',
     'الربع الثالث', 'الربع الرابع'],
   AMPMS: ['ص', 'م'],
-  DATEFORMATS: ['EEEE، d MMMM، y', 'd MMMM، y', 'y/MM/dd', 'y/M/d'],
+  DATEFORMATS: ['EEEE، d MMMM، y', 'd MMMM، y', 'dd‏/MM‏/y',
+    'd‏/M‏/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 5,
@@ -2263,7 +2145,8 @@ goog.i18n.DateTimeSymbols_ar_TN = {
   QUARTERS: ['الربع الأول', 'الربع الثاني',
     'الربع الثالث', 'الربع الرابع'],
   AMPMS: ['ص', 'م'],
-  DATEFORMATS: ['EEEE، d MMMM، y', 'd MMMM، y', 'y/MM/dd', 'y/M/d'],
+  DATEFORMATS: ['EEEE، d MMMM، y', 'd MMMM، y', 'dd‏/MM‏/y',
+    'd‏/M‏/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -2615,9 +2498,9 @@ goog.i18n.DateTimeSymbols_bas_CM = goog.i18n.DateTimeSymbols_bas;
 
 
 /**
- * Date/time formatting symbols for locale be.
+ * Date/time formatting symbols for locale be_BY.
  */
-goog.i18n.DateTimeSymbols_be = {
+goog.i18n.DateTimeSymbols_be_BY = {
   ERAS: ['да н.э.', 'н.э.'],
   ERANAMES: ['да н.э.', 'н.э.'],
   NARROWMONTHS: ['с', 'л', 'с', 'к', 'м', 'ч', 'л', 'ж', 'в', 'к',
@@ -2660,12 +2543,6 @@ goog.i18n.DateTimeSymbols_be = {
 };
 
 
-/**
- * Date/time formatting symbols for locale be_BY.
- */
-goog.i18n.DateTimeSymbols_be_BY = goog.i18n.DateTimeSymbols_be;
-
-
 /**
  * Date/time formatting symbols for locale bem.
  */
@@ -2906,16 +2783,10 @@ goog.i18n.DateTimeSymbols_bn_BD = {
   NARROWWEEKDAYS: ['র', 'সো', 'ম', 'বু', 'বৃ', 'শু', 'শ'],
   STANDALONENARROWWEEKDAYS: ['র', 'সো', 'ম', 'বু', 'বৃ',
     'শু', 'শ'],
-  SHORTQUARTERS: [
-    'প্র. ত্রৈ. এক. চতুর্থাংশ',
-    'দ্বি.ত্রৈ.এক. চতুর্থাংশ',
-    'তৃ.ত্রৈ.এক.চতুর্থাংশ',
-    'চ.ত্রৈ.এক চতুর্থাংশ'],
-  QUARTERS: [
-    'প্রথম ত্রৈমাসিকের এক চতুর্থাংশ',
-    'দ্বিতীয় ত্রৈমাসিকের এক চতুর্থাংশ',
-    'তৃতীয় ত্রৈমাসিকের এক চতুর্থাংশ',
-    'চতুর্থ ত্রৈমাসিকের এক চতুর্থাংশ'],
+  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
+  QUARTERS: ['ত্রৈমাসিক', 'ষাণ্মাসিক',
+    'তৃতীয় চতুর্থাংশ',
+    'চতুর্থ ত্রৈমাসিক'],
   AMPMS: ['am', 'pm'],
   DATEFORMATS: ['EEEE, d MMMM, y', 'd MMMM, y', 'd MMM, y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
@@ -2976,11 +2847,10 @@ goog.i18n.DateTimeSymbols_bn_IN = {
   NARROWWEEKDAYS: ['র', 'সো', 'ম', 'বু', 'বৃ', 'শু', 'শ'],
   STANDALONENARROWWEEKDAYS: ['র', 'সো', 'ম', 'বু', 'বৃ',
     'শু', 'শ'],
-  SHORTQUARTERS: ['ত্রৈমাসিক', 'ষাণ্মাসিক',
-    'তৃ.ত্রৈ.এক.চতুর্থাংশ',
-    'বার্ষিক'],
+  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['ত্রৈমাসিক', 'ষাণ্মাসিক',
-    'তৃতীয় চতুর্থাংশ', 'বার্ষিক'],
+    'তৃতীয় চতুর্থাংশ',
+    'চতুর্থ ত্রৈমাসিক'],
   AMPMS: ['am', 'pm'],
   DATEFORMATS: ['EEEE, d MMMM, y', 'd MMMM, y', 'd MMM, y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
@@ -3184,44 +3054,6 @@ goog.i18n.DateTimeSymbols_brx = {
 goog.i18n.DateTimeSymbols_brx_IN = goog.i18n.DateTimeSymbols_brx;
 
 
-/**
- * Date/time formatting symbols for locale bs.
- */
-goog.i18n.DateTimeSymbols_bs = {
-  ERAS: ['p. n. e.', 'n. e.'],
-  ERANAMES: ['Prije nove ere', 'Nove ere'],
-  NARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
-  STANDALONENARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o',
-    'n', 'd'],
-  MONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'juni', 'juli',
-    'august', 'septembar', 'oktobar', 'novembar', 'decembar'],
-  STANDALONEMONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'juni',
-    'juli', 'august', 'septembar', 'oktobar', 'novembar', 'decembar'],
-  SHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep',
-    'okt', 'nov', 'dec'],
-  STANDALONESHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul',
-    'aug', 'sep', 'okt', 'nov', 'dec'],
-  WEEKDAYS: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda', 'četvrtak',
-    'petak', 'subota'],
-  STANDALONEWEEKDAYS: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda',
-    'četvrtak', 'petak', 'subota'],
-  SHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
-  STANDALONESHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
-  NARROWWEEKDAYS: ['N', 'P', 'U', 'S', 'Č', 'P', 'S'],
-  STANDALONENARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
-  SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
-  QUARTERS: ['Prvi kvartal', 'Drugi kvartal', 'Treći kvartal',
-    'Četvrti kvartal'],
-  AMPMS: ['prije podne', 'popodne'],
-  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd. MMM. y.', 'dd.MM.yy.'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} \'u\' {0}', '{1} \'u\' {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 0,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 6
-};
-
-
 /**
  * Date/time formatting symbols for locale bs_Cyrl.
  */
@@ -3274,13 +3106,45 @@ goog.i18n.DateTimeSymbols_bs_Cyrl_BA = goog.i18n.DateTimeSymbols_bs_Cyrl;
 /**
  * Date/time formatting symbols for locale bs_Latn.
  */
-goog.i18n.DateTimeSymbols_bs_Latn = goog.i18n.DateTimeSymbols_bs;
+goog.i18n.DateTimeSymbols_bs_Latn = {
+  ERAS: ['p. n. e.', 'n. e.'],
+  ERANAMES: ['Prije nove ere', 'Nove ere'],
+  NARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  STANDALONENARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o',
+    'n', 'd'],
+  MONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'juni', 'juli',
+    'august', 'septembar', 'oktobar', 'novembar', 'decembar'],
+  STANDALONEMONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'juni',
+    'juli', 'august', 'septembar', 'oktobar', 'novembar', 'decembar'],
+  SHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep',
+    'okt', 'nov', 'dec'],
+  STANDALONESHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul',
+    'aug', 'sep', 'okt', 'nov', 'dec'],
+  WEEKDAYS: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda', 'četvrtak',
+    'petak', 'subota'],
+  STANDALONEWEEKDAYS: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda',
+    'četvrtak', 'petak', 'subota'],
+  SHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
+  STANDALONESHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
+  NARROWWEEKDAYS: ['N', 'P', 'U', 'S', 'Č', 'P', 'S'],
+  STANDALONENARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
+  SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
+  QUARTERS: ['Prvi kvartal', 'Drugi kvartal', 'Treći kvartal',
+    'Četvrti kvartal'],
+  AMPMS: ['prije podne', 'popodne'],
+  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd. MMM. y.', 'dd.MM.yy.'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  DATETIMEFORMATS: ['{1} \'u\' {0}', '{1} \'u\' {0}', '{1} {0}', '{1} {0}'],
+  FIRSTDAYOFWEEK: 0,
+  WEEKENDRANGE: [5, 6],
+  FIRSTWEEKCUTOFFDAY: 6
+};
 
 
 /**
  * Date/time formatting symbols for locale bs_Latn_BA.
  */
-goog.i18n.DateTimeSymbols_bs_Latn_BA = goog.i18n.DateTimeSymbols_bs;
+goog.i18n.DateTimeSymbols_bs_Latn_BA = goog.i18n.DateTimeSymbols_bs_Latn;
 
 
 /**
@@ -3293,8 +3157,9 @@ goog.i18n.DateTimeSymbols_ca_AD = {
     'NV', 'DS'],
   STANDALONENARROWMONTHS: ['GN', 'FB', 'MÇ', 'AB', 'MG', 'JN', 'JL', 'AG',
     'ST', 'OC', 'NV', 'DS'],
-  MONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny', 'juliol',
-    'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
+  MONTHS: ['de gener', 'de febrer', 'de març', 'd’abril', 'de maig',
+    'de juny', 'de juliol', 'd’agost', 'de setembre', 'd’octubre',
+    'de novembre', 'de desembre'],
   STANDALONEMONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny',
     'juliol', 'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
   SHORTMONTHS: ['gen.', 'febr.', 'març', 'abr.', 'maig', 'juny', 'jul.', 'ag.',
@@ -3332,8 +3197,9 @@ goog.i18n.DateTimeSymbols_ca_ES = {
     'NV', 'DS'],
   STANDALONENARROWMONTHS: ['GN', 'FB', 'MÇ', 'AB', 'MG', 'JN', 'JL', 'AG',
     'ST', 'OC', 'NV', 'DS'],
-  MONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny', 'juliol',
-    'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
+  MONTHS: ['de gener', 'de febrer', 'de març', 'd’abril', 'de maig',
+    'de juny', 'de juliol', 'd’agost', 'de setembre', 'd’octubre',
+    'de novembre', 'de desembre'],
   STANDALONEMONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny',
     'juliol', 'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
   SHORTMONTHS: ['gen.', 'febr.', 'març', 'abr.', 'maig', 'juny', 'jul.', 'ag.',
@@ -3377,8 +3243,9 @@ goog.i18n.DateTimeSymbols_ca_FR = {
     'NV', 'DS'],
   STANDALONENARROWMONTHS: ['GN', 'FB', 'MÇ', 'AB', 'MG', 'JN', 'JL', 'AG',
     'ST', 'OC', 'NV', 'DS'],
-  MONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny', 'juliol',
-    'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
+  MONTHS: ['de gener', 'de febrer', 'de març', 'd’abril', 'de maig',
+    'de juny', 'de juliol', 'd’agost', 'de setembre', 'd’octubre',
+    'de novembre', 'de desembre'],
   STANDALONEMONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny',
     'juliol', 'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
   SHORTMONTHS: ['gen.', 'febr.', 'març', 'abr.', 'maig', 'juny', 'jul.', 'ag.',
@@ -3416,8 +3283,9 @@ goog.i18n.DateTimeSymbols_ca_IT = {
     'NV', 'DS'],
   STANDALONENARROWMONTHS: ['GN', 'FB', 'MÇ', 'AB', 'MG', 'JN', 'JL', 'AG',
     'ST', 'OC', 'NV', 'DS'],
-  MONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny', 'juliol',
-    'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
+  MONTHS: ['de gener', 'de febrer', 'de març', 'd’abril', 'de maig',
+    'de juny', 'de juliol', 'd’agost', 'de setembre', 'd’octubre',
+    'de novembre', 'de desembre'],
   STANDALONEMONTHS: ['gener', 'febrer', 'març', 'abril', 'maig', 'juny',
     'juliol', 'agost', 'setembre', 'octubre', 'novembre', 'desembre'],
   SHORTMONTHS: ['gen.', 'febr.', 'març', 'abr.', 'maig', 'juny', 'jul.', 'ag.',
@@ -3656,7 +3524,7 @@ goog.i18n.DateTimeSymbols_cs_CZ = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1. čtvrtletí', '2. čtvrtletí', '3. čtvrtletí',
     '4. čtvrtletí'],
-  AMPMS: ['AM', 'PM'],
+  AMPMS: ['dopoledne', 'odpoledne'],
   DATEFORMATS: ['EEEE d. MMMM y', 'd. MMMM y', 'd. M. y', 'dd.MM.yy'],
   TIMEFORMATS: ['H:mm:ss zzzz', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
@@ -3731,7 +3599,7 @@ goog.i18n.DateTimeSymbols_da_DK = {
   SHORTQUARTERS: ['1. kvt.', '2. kvt.', '3. kvt.', '4. kvt.'],
   QUARTERS: ['1. kvartal', '2. kvartal', '3. kvartal', '4. kvartal'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE \'den\' d. MMMM y', 'd. MMMM y', 'dd/MM/y', 'dd/MM/yy'],
+  DATEFORMATS: ['EEEE \'den\' d. MMMM y', 'd. MMMM y', 'd. MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
   DATETIMEFORMATS: ['{1} \'kl.\' {0}', '{1} \'kl.\' {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -3768,7 +3636,7 @@ goog.i18n.DateTimeSymbols_da_GL = {
   SHORTQUARTERS: ['1. kvt.', '2. kvt.', '3. kvt.', '4. kvt.'],
   QUARTERS: ['1. kvartal', '2. kvartal', '3. kvartal', '4. kvartal'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE \'den\' d. MMMM y', 'd. MMMM y', 'dd/MM/y', 'dd/MM/yy'],
+  DATEFORMATS: ['EEEE \'den\' d. MMMM y', 'd. MMMM y', 'd. MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
   DATETIMEFORMATS: ['{1} \'kl.\' {0}', '{1} \'kl.\' {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -4449,7 +4317,7 @@ goog.i18n.DateTimeSymbols_en_001 = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -4485,10 +4353,10 @@ goog.i18n.DateTimeSymbols_en_150 = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
-  DATEFORMATS: ['EEEE d MMMM y', 'd MMM y', 'dd MMM y', 'dd/MM/yy'],
-  TIMEFORMATS: ['HH \'h\' mm \'min\' ss \'s\' zzzz', 'HH:mm:ss z', 'HH:mm:ss',
-    'HH:mm'],
+  AMPMS: ['AM', 'PM'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'dd MMM y', 'dd/MM/yy'],
+  TIMEFORMATS: ['HH \'h\' mm \'min\' ss \'s\' zzzz', 'h:mm:ss a z', 'h:mm:ss a',
+    'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -4524,7 +4392,7 @@ goog.i18n.DateTimeSymbols_en_AG = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -4561,7 +4429,7 @@ goog.i18n.DateTimeSymbols_en_AI = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -4635,7 +4503,7 @@ goog.i18n.DateTimeSymbols_en_BB = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -4671,10 +4539,10 @@ goog.i18n.DateTimeSymbols_en_BE = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
-  DATEFORMATS: ['EEEE d MMMM y', 'd MMM y', 'dd MMM y', 'dd/MM/yy'],
-  TIMEFORMATS: ['HH \'h\' mm \'min\' ss \'s\' zzzz', 'HH:mm:ss z', 'HH:mm:ss',
-    'HH:mm'],
+  AMPMS: ['AM', 'PM'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'dd MMM y', 'dd/MM/yy'],
+  TIMEFORMATS: ['HH \'h\' mm \'min\' ss \'s\' zzzz', 'h:mm:ss a z', 'h:mm:ss a',
+    'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -4710,7 +4578,7 @@ goog.i18n.DateTimeSymbols_en_BM = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -4747,7 +4615,7 @@ goog.i18n.DateTimeSymbols_en_BS = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -4784,7 +4652,7 @@ goog.i18n.DateTimeSymbols_en_BW = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE dd MMMM y', 'dd MMMM y', 'dd MMM y', 'dd/MM/yy'],
+  DATEFORMATS: ['EEEE, dd MMMM y', 'dd MMMM y', 'dd MMM y', 'dd/MM/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -4821,7 +4689,7 @@ goog.i18n.DateTimeSymbols_en_BZ = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE dd MMMM y', 'dd MMMM y', 'dd-MMM-y', 'dd/MM/yy'],
+  DATEFORMATS: ['EEEE, dd MMMM y', 'dd MMMM y', 'dd-MMM-y', 'dd/MM/yy'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -4830,43 +4698,6 @@ goog.i18n.DateTimeSymbols_en_BZ = {
 };
 
 
-/**
- * Date/time formatting symbols for locale en_CA.
- */
-goog.i18n.DateTimeSymbols_en_CA = {
-  ERAS: ['BC', 'AD'],
-  ERANAMES: ['Before Christ', 'Anno Domini'],
-  NARROWMONTHS: ['J', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
-  STANDALONENARROWMONTHS: ['J', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
-    'N', 'D'],
-  MONTHS: ['January', 'February', 'March', 'April', 'May', 'June', 'July',
-    'August', 'September', 'October', 'November', 'December'],
-  STANDALONEMONTHS: ['January', 'February', 'March', 'April', 'May', 'June',
-    'July', 'August', 'September', 'October', 'November', 'December'],
-  SHORTMONTHS: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
-    'Oct', 'Nov', 'Dec'],
-  STANDALONESHORTMONTHS: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul',
-    'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-  WEEKDAYS: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday',
-    'Saturday'],
-  STANDALONEWEEKDAYS: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday',
-    'Friday', 'Saturday'],
-  SHORTWEEKDAYS: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-  STANDALONESHORTWEEKDAYS: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'y-MM-dd'],
-  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
-  DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
-  FIRSTDAYOFWEEK: 6,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
-};
-
-
 /**
  * Date/time formatting symbols for locale en_CC.
  */
@@ -4895,7 +4726,7 @@ goog.i18n.DateTimeSymbols_en_CC = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -4932,7 +4763,7 @@ goog.i18n.DateTimeSymbols_en_CK = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -4969,7 +4800,7 @@ goog.i18n.DateTimeSymbols_en_CM = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5006,7 +4837,7 @@ goog.i18n.DateTimeSymbols_en_CX = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5042,9 +4873,9 @@ goog.i18n.DateTimeSymbols_en_DG = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -5080,7 +4911,7 @@ goog.i18n.DateTimeSymbols_en_DM = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -5117,7 +4948,7 @@ goog.i18n.DateTimeSymbols_en_ER = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5154,7 +4985,7 @@ goog.i18n.DateTimeSymbols_en_FJ = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5190,9 +5021,9 @@ goog.i18n.DateTimeSymbols_en_FK = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -5228,7 +5059,7 @@ goog.i18n.DateTimeSymbols_en_FM = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5265,7 +5096,7 @@ goog.i18n.DateTimeSymbols_en_GD = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5301,9 +5132,9 @@ goog.i18n.DateTimeSymbols_en_GG = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -5339,7 +5170,7 @@ goog.i18n.DateTimeSymbols_en_GH = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5375,9 +5206,9 @@ goog.i18n.DateTimeSymbols_en_GI = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -5413,7 +5244,7 @@ goog.i18n.DateTimeSymbols_en_GM = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5487,7 +5318,7 @@ goog.i18n.DateTimeSymbols_en_GY = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5523,7 +5354,7 @@ goog.i18n.DateTimeSymbols_en_HK = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'd/M/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
@@ -5560,9 +5391,9 @@ goog.i18n.DateTimeSymbols_en_IM = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -5597,9 +5428,9 @@ goog.i18n.DateTimeSymbols_en_IO = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -5634,9 +5465,9 @@ goog.i18n.DateTimeSymbols_en_JE = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -5672,7 +5503,7 @@ goog.i18n.DateTimeSymbols_en_JM = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'd/M/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -5709,7 +5540,7 @@ goog.i18n.DateTimeSymbols_en_KE = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -5746,7 +5577,7 @@ goog.i18n.DateTimeSymbols_en_KI = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5783,7 +5614,7 @@ goog.i18n.DateTimeSymbols_en_KN = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5820,7 +5651,7 @@ goog.i18n.DateTimeSymbols_en_KY = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5857,7 +5688,7 @@ goog.i18n.DateTimeSymbols_en_LC = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5894,7 +5725,7 @@ goog.i18n.DateTimeSymbols_en_LR = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5931,7 +5762,7 @@ goog.i18n.DateTimeSymbols_en_LS = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -5968,7 +5799,7 @@ goog.i18n.DateTimeSymbols_en_MG = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6041,9 +5872,9 @@ goog.i18n.DateTimeSymbols_en_MO = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -6116,7 +5947,7 @@ goog.i18n.DateTimeSymbols_en_MS = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6152,9 +5983,9 @@ goog.i18n.DateTimeSymbols_en_MT = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'dd MMMM y', 'dd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -6190,7 +6021,7 @@ goog.i18n.DateTimeSymbols_en_MU = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6227,7 +6058,7 @@ goog.i18n.DateTimeSymbols_en_MW = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6264,7 +6095,7 @@ goog.i18n.DateTimeSymbols_en_MY = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6301,7 +6132,7 @@ goog.i18n.DateTimeSymbols_en_NA = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6338,7 +6169,7 @@ goog.i18n.DateTimeSymbols_en_NF = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6375,7 +6206,7 @@ goog.i18n.DateTimeSymbols_en_NG = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6412,7 +6243,7 @@ goog.i18n.DateTimeSymbols_en_NR = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6449,7 +6280,7 @@ goog.i18n.DateTimeSymbols_en_NU = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6485,7 +6316,7 @@ goog.i18n.DateTimeSymbols_en_NZ = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd/MM/y', 'd/MM/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
@@ -6523,7 +6354,7 @@ goog.i18n.DateTimeSymbols_en_PG = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6560,7 +6391,7 @@ goog.i18n.DateTimeSymbols_en_PH = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -6596,8 +6427,8 @@ goog.i18n.DateTimeSymbols_en_PK = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
-  DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'dd-MMM-y', 'dd/MM/y'],
+  AMPMS: ['AM', 'PM'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'dd-MMM-y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -6634,7 +6465,7 @@ goog.i18n.DateTimeSymbols_en_PN = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6708,7 +6539,7 @@ goog.i18n.DateTimeSymbols_en_PW = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6745,7 +6576,7 @@ goog.i18n.DateTimeSymbols_en_RW = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6782,7 +6613,7 @@ goog.i18n.DateTimeSymbols_en_SB = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6819,7 +6650,7 @@ goog.i18n.DateTimeSymbols_en_SC = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6856,7 +6687,7 @@ goog.i18n.DateTimeSymbols_en_SD = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 5,
@@ -6892,9 +6723,9 @@ goog.i18n.DateTimeSymbols_en_SH = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -6930,7 +6761,7 @@ goog.i18n.DateTimeSymbols_en_SL = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -6967,7 +6798,7 @@ goog.i18n.DateTimeSymbols_en_SS = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7004,7 +6835,7 @@ goog.i18n.DateTimeSymbols_en_SX = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7041,7 +6872,7 @@ goog.i18n.DateTimeSymbols_en_SZ = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7078,7 +6909,7 @@ goog.i18n.DateTimeSymbols_en_TC = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7115,7 +6946,7 @@ goog.i18n.DateTimeSymbols_en_TK = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7152,7 +6983,7 @@ goog.i18n.DateTimeSymbols_en_TO = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7189,7 +7020,7 @@ goog.i18n.DateTimeSymbols_en_TT = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -7226,7 +7057,7 @@ goog.i18n.DateTimeSymbols_en_TV = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7263,7 +7094,7 @@ goog.i18n.DateTimeSymbols_en_TZ = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7300,7 +7131,7 @@ goog.i18n.DateTimeSymbols_en_UG = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7374,7 +7205,7 @@ goog.i18n.DateTimeSymbols_en_VC = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7410,9 +7241,9 @@ goog.i18n.DateTimeSymbols_en_VG = {
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
-  AMPMS: ['am', 'pm'],
+  AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -7485,7 +7316,7 @@ goog.i18n.DateTimeSymbols_en_VU = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7522,7 +7353,7 @@ goog.i18n.DateTimeSymbols_en_WS = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -7559,7 +7390,7 @@ goog.i18n.DateTimeSymbols_en_ZM = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, MMMM d, y', 'MMMM d, y', 'MMM d, y', 'M/d/yy'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7596,7 +7427,7 @@ goog.i18n.DateTimeSymbols_en_ZW = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['1st quarter', '2nd quarter', '3rd quarter', '4th quarter'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE dd MMMM y', 'dd MMMM y', 'dd MMM,y', 'd/M/y'],
+  DATEFORMATS: ['EEEE, dd MMMM y', 'dd MMMM y', 'dd MMM,y', 'd/M/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} \'at\' {0}', '{1} \'at\' {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -7657,17 +7488,17 @@ goog.i18n.DateTimeSymbols_eo_001 = goog.i18n.DateTimeSymbols_eo;
 goog.i18n.DateTimeSymbols_es_AR = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -7677,13 +7508,13 @@ goog.i18n.DateTimeSymbols_es_AR = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
-  TIMEFORMATS: ['HH\'h\'\'\'mm:ss zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
+    'd MMM y', 'd/M/yy'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -7697,17 +7528,17 @@ goog.i18n.DateTimeSymbols_es_AR = {
 goog.i18n.DateTimeSymbols_es_BO = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -7717,12 +7548,12 @@ goog.i18n.DateTimeSymbols_es_BO = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7737,17 +7568,17 @@ goog.i18n.DateTimeSymbols_es_BO = {
 goog.i18n.DateTimeSymbols_es_CL = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -7757,10 +7588,10 @@ goog.i18n.DateTimeSymbols_es_CL = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
     'dd-MM-y', 'dd-MM-yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
@@ -7777,17 +7608,17 @@ goog.i18n.DateTimeSymbols_es_CL = {
 goog.i18n.DateTimeSymbols_es_CO = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -7797,13 +7628,13 @@ goog.i18n.DateTimeSymbols_es_CO = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
     'd/MM/y', 'd/MM/yy'],
-  TIMEFORMATS: ['h:mm:ss a (zzzz)', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -7817,17 +7648,17 @@ goog.i18n.DateTimeSymbols_es_CO = {
 goog.i18n.DateTimeSymbols_es_CR = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -7837,12 +7668,12 @@ goog.i18n.DateTimeSymbols_es_CR = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7857,17 +7688,17 @@ goog.i18n.DateTimeSymbols_es_CR = {
 goog.i18n.DateTimeSymbols_es_CU = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -7877,12 +7708,12 @@ goog.i18n.DateTimeSymbols_es_CU = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7897,17 +7728,17 @@ goog.i18n.DateTimeSymbols_es_CU = {
 goog.i18n.DateTimeSymbols_es_DO = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -7917,12 +7748,12 @@ goog.i18n.DateTimeSymbols_es_DO = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -7936,7 +7767,7 @@ goog.i18n.DateTimeSymbols_es_DO = {
  */
 goog.i18n.DateTimeSymbols_es_EA = {
   ERAS: ['a. C.', 'd. C.'],
-  ERANAMES: ['antes de Cristo', 'anno Dómini'],
+  ERANAMES: ['antes de Cristo', 'después de Cristo'],
   NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
@@ -7962,7 +7793,7 @@ goog.i18n.DateTimeSymbols_es_EA = {
     '4.º trimestre'],
   AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['H:mm:ss (zzzz)', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -7977,17 +7808,17 @@ goog.i18n.DateTimeSymbols_es_EA = {
 goog.i18n.DateTimeSymbols_es_EC = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -7997,12 +7828,12 @@ goog.i18n.DateTimeSymbols_es_EC = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -8016,7 +7847,7 @@ goog.i18n.DateTimeSymbols_es_EC = {
  */
 goog.i18n.DateTimeSymbols_es_GQ = {
   ERAS: ['a. C.', 'd. C.'],
-  ERANAMES: ['antes de Cristo', 'anno Dómini'],
+  ERANAMES: ['antes de Cristo', 'después de Cristo'],
   NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
@@ -8042,7 +7873,7 @@ goog.i18n.DateTimeSymbols_es_GQ = {
     '4.º trimestre'],
   AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['H:mm:ss (zzzz)', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -8057,17 +7888,17 @@ goog.i18n.DateTimeSymbols_es_GQ = {
 goog.i18n.DateTimeSymbols_es_GT = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -8077,10 +7908,10 @@ goog.i18n.DateTimeSymbols_es_GT = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
     'd/MM/y', 'd/MM/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
@@ -8097,17 +7928,17 @@ goog.i18n.DateTimeSymbols_es_GT = {
 goog.i18n.DateTimeSymbols_es_HN = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -8117,12 +7948,12 @@ goog.i18n.DateTimeSymbols_es_HN = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE dd \'de\' MMMM \'de\' y', 'dd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -8136,7 +7967,7 @@ goog.i18n.DateTimeSymbols_es_HN = {
  */
 goog.i18n.DateTimeSymbols_es_IC = {
   ERAS: ['a. C.', 'd. C.'],
-  ERANAMES: ['antes de Cristo', 'anno Dómini'],
+  ERANAMES: ['antes de Cristo', 'después de Cristo'],
   NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
@@ -8162,7 +7993,7 @@ goog.i18n.DateTimeSymbols_es_IC = {
     '4.º trimestre'],
   AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['H:mm:ss (zzzz)', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -8171,62 +8002,23 @@ goog.i18n.DateTimeSymbols_es_IC = {
 };
 
 
-/**
- * Date/time formatting symbols for locale es_MX.
- */
-goog.i18n.DateTimeSymbols_es_MX = {
-  ERAS: ['a.C.', 'd.C.'],
-  ERANAMES: ['antes de Cristo', 'Anno Domini'],
-  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
-  STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
-    'N', 'D'],
-  MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
-  STANDALONEMONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio',
-    'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
-  SHORTMONTHS: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep',
-    'oct', 'nov', 'dic'],
-  STANDALONESHORTMONTHS: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul',
-    'ago', 'sep', 'oct', 'nov', 'dic'],
-  WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
-    'sábado'],
-  STANDALONEWEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves',
-    'viernes', 'sábado'],
-  SHORTWEEKDAYS: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'],
-  STANDALONESHORTWEEKDAYS: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'],
-  NARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  STANDALONENARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
-  SHORTQUARTERS: ['1er. trim.', '2º. trim.', '3er. trim.', '4º trim.'],
-  QUARTERS: ['1er. trimestre', '2º. trimestre', '3er. trimestre',
-    '4º trimestre'],
-  AMPMS: ['a.m.', 'p.m.'],
-  DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'dd/MM/y', 'dd/MM/yy'],
-  TIMEFORMATS: ['H:mm:ss zzzz', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 6,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
-};
-
-
 /**
  * Date/time formatting symbols for locale es_NI.
  */
 goog.i18n.DateTimeSymbols_es_NI = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -8236,12 +8028,12 @@ goog.i18n.DateTimeSymbols_es_NI = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -8256,17 +8048,17 @@ goog.i18n.DateTimeSymbols_es_NI = {
 goog.i18n.DateTimeSymbols_es_PA = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -8276,10 +8068,10 @@ goog.i18n.DateTimeSymbols_es_PA = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
     'MM/dd/y', 'MM/dd/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
@@ -8296,7 +8088,7 @@ goog.i18n.DateTimeSymbols_es_PA = {
 goog.i18n.DateTimeSymbols_es_PE = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
@@ -8316,14 +8108,13 @@ goog.i18n.DateTimeSymbols_es_PE = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/MM/yy'],
-  TIMEFORMATS: ['HH\'H\'mm\'\'ss\'\' zzzz', 'h:mm:ss a z', 'h:mm:ss a',
-    'h:mm a'],
+    'd MMM y', 'd/MM/yy'],
+  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -8336,7 +8127,7 @@ goog.i18n.DateTimeSymbols_es_PE = {
  */
 goog.i18n.DateTimeSymbols_es_PH = {
   ERAS: ['a. C.', 'd. C.'],
-  ERANAMES: ['antes de Cristo', 'anno Dómini'],
+  ERANAMES: ['antes de Cristo', 'después de Cristo'],
   NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
@@ -8362,7 +8153,7 @@ goog.i18n.DateTimeSymbols_es_PH = {
     '4.º trimestre'],
   AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['H:mm:ss (zzzz)', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -8377,17 +8168,17 @@ goog.i18n.DateTimeSymbols_es_PH = {
 goog.i18n.DateTimeSymbols_es_PR = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -8397,10 +8188,10 @@ goog.i18n.DateTimeSymbols_es_PR = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
     'MM/dd/y', 'MM/dd/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
@@ -8414,60 +8205,20 @@ goog.i18n.DateTimeSymbols_es_PR = {
 /**
  * Date/time formatting symbols for locale es_PY.
  */
-goog.i18n.DateTimeSymbols_es_PY = {
-  ERAS: ['a. C.', 'd. C.'],
-  ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
-  STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
-    'N', 'D'],
-  MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
-  STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
-  SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
-  STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
-  WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
-    'sábado'],
-  STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
-    'Viernes', 'Sábado'],
-  SHORTWEEKDAYS: ['dom.', 'lun.', 'mar.', 'mié.', 'jue.', 'vie.', 'sáb.'],
-  STANDALONESHORTWEEKDAYS: ['Dom.', 'Lun.', 'Mar.', 'Mié.', 'Jue.', 'Vie.',
-    'Sáb.'],
-  NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
-  STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
-  QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
-    '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
-  DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
-  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
-  DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 6,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
-};
-
-
-/**
- * Date/time formatting symbols for locale es_SV.
- */
-goog.i18n.DateTimeSymbols_es_SV = {
+goog.i18n.DateTimeSymbols_es_PY = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -8477,12 +8228,12 @@ goog.i18n.DateTimeSymbols_es_SV = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -8492,22 +8243,22 @@ goog.i18n.DateTimeSymbols_es_SV = {
 
 
 /**
- * Date/time formatting symbols for locale es_US.
+ * Date/time formatting symbols for locale es_SV.
  */
-goog.i18n.DateTimeSymbols_es_US = {
+goog.i18n.DateTimeSymbols_es_SV = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -8517,12 +8268,12 @@ goog.i18n.DateTimeSymbols_es_US = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['AM', 'PM'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -8537,7 +8288,7 @@ goog.i18n.DateTimeSymbols_es_US = {
 goog.i18n.DateTimeSymbols_es_UY = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
@@ -8557,12 +8308,12 @@ goog.i18n.DateTimeSymbols_es_UY = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -8577,17 +8328,17 @@ goog.i18n.DateTimeSymbols_es_UY = {
 goog.i18n.DateTimeSymbols_es_VE = {
   ERAS: ['a. C.', 'd. C.'],
   ERANAMES: ['antes de Cristo', 'después de Cristo'],
-  NARROWMONTHS: ['e', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  NARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
   STANDALONENARROWMONTHS: ['E', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O',
     'N', 'D'],
   MONTHS: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio',
-    'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'],
+    'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
   STANDALONEMONTHS: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
-    'Julio', 'Agosto', 'Setiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+    'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
   SHORTMONTHS: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.',
-    'set.', 'oct.', 'nov.', 'dic.'],
+    'sept.', 'oct.', 'nov.', 'dic.'],
   STANDALONESHORTMONTHS: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.',
-    'Jul.', 'Ago.', 'Set.', 'Oct.', 'Nov.', 'Dic.'],
+    'Jul.', 'Ago.', 'Sept.', 'Oct.', 'Nov.', 'Dic.'],
   WEEKDAYS: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes',
     'sábado'],
   STANDALONEWEEKDAYS: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves',
@@ -8597,12 +8348,12 @@ goog.i18n.DateTimeSymbols_es_VE = {
     'Sáb.'],
   NARROWWEEKDAYS: ['d', 'l', 'm', 'm', 'j', 'v', 's'],
   STANDALONENARROWWEEKDAYS: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-  SHORTQUARTERS: ['1.er trim.', '2.º trim.', '3.er trim.', '4.º trim.'],
+  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
   QUARTERS: ['1.er trimestre', '2.º trimestre', '3.er trimestre',
     '4.º trimestre'],
-  AMPMS: ['a. m.', 'p. m.'],
+  AMPMS: ['a. m.', 'p. m.'],
   DATEFORMATS: ['EEEE, d \'de\' MMMM \'de\' y', 'd \'de\' MMMM \'de\' y',
-    'd \'de\' MMM \'de\' y', 'd/M/yy'],
+    'd MMM y', 'd/M/yy'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -8928,7 +8679,8 @@ goog.i18n.DateTimeSymbols_fi_FI = {
   AMPMS: ['ap.', 'ip.'],
   DATEFORMATS: ['cccc d. MMMM y', 'd. MMMM y', 'd.M.y', 'd.M.y'],
   TIMEFORMATS: ['H.mm.ss zzzz', 'H.mm.ss z', 'H.mm.ss', 'H.mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
+  DATETIMEFORMATS: ['{1} \'klo\' {0}', '{1} \'klo\' {0}', '{1} \'klo\' {0}',
+    '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
   FIRSTWEEKCUTOFFDAY: 3
@@ -11335,7 +11087,7 @@ goog.i18n.DateTimeSymbols_he_IL = {
   QUARTERS: ['רבעון 1', 'רבעון 2', 'רבעון 3', 'רבעון 4'],
   AMPMS: ['לפנה״צ', 'אחה״צ'],
   DATEFORMATS: ['EEEE, d בMMMM y', 'd בMMMM y', 'd בMMM y', 'd.M.y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['H:mm:ss zzzz', 'H:mm:ss z', 'H:mm:ss', 'H:mm'],
   DATETIMEFORMATS: ['{1} בשעה {0}', '{1} בשעה {0}', '{1}, {0}',
     '{1}, {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -11602,51 +11354,6 @@ goog.i18n.DateTimeSymbols_hy_AM = {
 };
 
 
-/**
- * Date/time formatting symbols for locale ia.
- */
-goog.i18n.DateTimeSymbols_ia = {
-  ERAS: ['a.Chr.', 'p.Chr.'],
-  ERANAMES: ['ante Christo', 'post Christo'],
-  NARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  STANDALONENARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
-    '11', '12'],
-  MONTHS: ['januario', 'februario', 'martio', 'april', 'maio', 'junio', 'julio',
-    'augusto', 'septembre', 'octobre', 'novembre', 'decembre'],
-  STANDALONEMONTHS: ['januario', 'februario', 'martio', 'april', 'maio',
-    'junio', 'julio', 'augusto', 'septembre', 'octobre', 'novembre',
-    'decembre'],
-  SHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'mai', 'jun', 'jul', 'aug', 'sep',
-    'oct', 'nov', 'dec'],
-  STANDALONESHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'mai', 'jun', 'jul',
-    'aug', 'sep', 'oct', 'nov', 'dec'],
-  WEEKDAYS: ['dominica', 'lunedi', 'martedi', 'mercuridi', 'jovedi', 'venerdi',
-    'sabbato'],
-  STANDALONEWEEKDAYS: ['dominica', 'lunedi', 'martedi', 'mercuridi', 'jovedi',
-    'venerdi', 'sabbato'],
-  SHORTWEEKDAYS: ['dom', 'lun', 'mar', 'mer', 'jov', 'ven', 'sab'],
-  STANDALONESHORTWEEKDAYS: ['dom', 'lun', 'mar', 'mer', 'jov', 'ven', 'sab'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['T1', 'T2', 'T3', 'T4'],
-  QUARTERS: ['1-me trimestre', '2-nde trimestre', '3-tie trimestre',
-    '4-te trimestre'],
-  AMPMS: ['a.m.', 'p.m.'],
-  DATEFORMATS: ['EEEE, y MMMM dd', 'y MMMM d', 'y MMM d', 'yy/MM/dd'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 0,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 6
-};
-
-
-/**
- * Date/time formatting symbols for locale ia_FR.
- */
-goog.i18n.DateTimeSymbols_ia_FR = goog.i18n.DateTimeSymbols_ia;
-
-
 /**
  * Date/time formatting symbols for locale id_ID.
  */
@@ -11843,7 +11550,7 @@ goog.i18n.DateTimeSymbols_it_CH = {
     '4º trimestre'],
   AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd-MMM-y', 'dd.MM.yy'],
-  TIMEFORMATS: ['HH.mm:ss \'h\' zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -12556,31 +12263,31 @@ goog.i18n.DateTimeSymbols_kl_GL = goog.i18n.DateTimeSymbols_kl;
 goog.i18n.DateTimeSymbols_kln = {
   ERAS: ['AM', 'KO'],
   ERANAMES: ['Amait kesich Jesu', 'Kokakesich Jesu'],
-  NARROWMONTHS: ['M', 'N', 'K', 'I', 'N', 'W', 'R', 'K', 'B', 'E', 'K', 'K'],
-  STANDALONENARROWMONTHS: ['M', 'N', 'K', 'I', 'N', 'W', 'R', 'K', 'B', 'E',
+  NARROWMONTHS: ['M', 'N', 'T', 'I', 'M', 'P', 'N', 'R', 'B', 'E', 'K', 'K'],
+  STANDALONENARROWMONTHS: ['M', 'N', 'T', 'I', 'M', 'P', 'N', 'R', 'B', 'E',
     'K', 'K'],
-  MONTHS: ['Mulgul', 'Ng’atyato', 'Kiptamo', 'Iwat kut', 'Ng’eiyet', 'Waki',
-    'Roptui', 'Kipkogaga', 'Buret', 'Epeso', 'Kipsunde netai',
-    'Kipsunde nebo aeng'],
-  STANDALONEMONTHS: ['Mulgul', 'Ng’atyato', 'Kiptamo', 'Iwat kut',
-    'Ng’eiyet', 'Waki', 'Roptui', 'Kipkogaga', 'Buret', 'Epeso',
-    'Kipsunde netai', 'Kipsunde nebo aeng'],
-  SHORTMONTHS: ['Mul', 'Nga', 'Kip', 'Iwa', 'Nge', 'Wak', 'Rop', 'Kog', 'Bur',
-    'Epe', 'Tai', 'Aen'],
-  STANDALONESHORTMONTHS: ['Mul', 'Nga', 'Kip', 'Iwa', 'Nge', 'Wak', 'Rop',
-    'Kog', 'Bur', 'Epe', 'Tai', 'Aen'],
-  WEEKDAYS: ['Betutab tisap', 'Betut netai', 'Betutab aeng’', 'Betutab somok',
-    'Betutab ang’wan', 'Betutab mut', 'Betutab lo'],
-  STANDALONEWEEKDAYS: ['Betutab tisap', 'Betut netai', 'Betutab aeng’',
-    'Betutab somok', 'Betutab ang’wan', 'Betutab mut', 'Betutab lo'],
-  SHORTWEEKDAYS: ['Tis', 'Tai', 'Aen', 'Som', 'Ang', 'Mut', 'Loh'],
-  STANDALONESHORTWEEKDAYS: ['Tis', 'Tai', 'Aen', 'Som', 'Ang', 'Mut', 'Loh'],
-  NARROWWEEKDAYS: ['T', 'T', 'A', 'S', 'A', 'M', 'L'],
-  STANDALONENARROWWEEKDAYS: ['T', 'T', 'A', 'S', 'A', 'M', 'L'],
+  MONTHS: ['Mulgul', 'Ng’atyaato', 'Kiptaamo', 'Iwootkuut', 'Mamuut', 'Paagi',
+    'Ng’eiyeet', 'Rooptui', 'Bureet', 'Epeeso', 'Kipsuunde ne taai',
+    'Kipsuunde nebo aeng’'],
+  STANDALONEMONTHS: ['Mulgul', 'Ng’atyaato', 'Kiptaamo', 'Iwootkuut',
+    'Mamuut', 'Paagi', 'Ng’eiyeet', 'Rooptui', 'Bureet', 'Epeeso',
+    'Kipsuunde ne taai', 'Kipsuunde nebo aeng’'],
+  SHORTMONTHS: ['Mul', 'Ngat', 'Taa', 'Iwo', 'Mam', 'Paa', 'Nge', 'Roo', 'Bur',
+    'Epe', 'Kpt', 'Kpa'],
+  STANDALONESHORTMONTHS: ['Mul', 'Ngat', 'Taa', 'Iwo', 'Mam', 'Paa', 'Nge',
+    'Roo', 'Bur', 'Epe', 'Kpt', 'Kpa'],
+  WEEKDAYS: ['Kotisap', 'Kotaai', 'Koaeng’', 'Kosomok', 'Koang’wan',
+    'Komuut', 'Kolo'],
+  STANDALONEWEEKDAYS: ['Kotisap', 'Kotaai', 'Koaeng’', 'Kosomok',
+    'Koang’wan', 'Komuut', 'Kolo'],
+  SHORTWEEKDAYS: ['Kts', 'Kot', 'Koo', 'Kos', 'Koa', 'Kom', 'Kol'],
+  STANDALONESHORTWEEKDAYS: ['Kts', 'Kot', 'Koo', 'Kos', 'Koa', 'Kom', 'Kol'],
+  NARROWWEEKDAYS: ['T', 'T', 'O', 'S', 'A', 'M', 'L'],
+  STANDALONENARROWWEEKDAYS: ['T', 'T', 'O', 'S', 'A', 'M', 'L'],
   SHORTQUARTERS: ['R1', 'R2', 'R3', 'R4'],
   QUARTERS: ['Robo netai', 'Robo nebo aeng’', 'Robo nebo somok',
     'Robo nebo ang’wan'],
-  AMPMS: ['Beet', 'Kemo'],
+  AMPMS: ['karoon', 'kooskoliny'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
   TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
@@ -13063,20 +12770,20 @@ goog.i18n.DateTimeSymbols_kw = {
   NARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
   STANDALONENARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
     '11', '12'],
-  MONTHS: ['Mys Genver', 'Mys Whevrel', 'Mys Merth', 'Mys Ebrel', 'Mys Me',
-    'Mys Efan', 'Mys Gortheren', 'Mye Est', 'Mys Gwyngala', 'Mys Hedra',
-    'Mys Du', 'Mys Kevardhu'],
-  STANDALONEMONTHS: ['Mys Genver', 'Mys Whevrel', 'Mys Merth', 'Mys Ebrel',
-    'Mys Me', 'Mys Efan', 'Mys Gortheren', 'Mye Est', 'Mys Gwyngala',
-    'Mys Hedra', 'Mys Du', 'Mys Kevardhu'],
-  SHORTMONTHS: ['Gen', 'Whe', 'Mer', 'Ebr', 'Me', 'Efn', 'Gor', 'Est', 'Gwn',
+  MONTHS: ['mis Genver', 'mis Hwevrer', 'mis Meurth', 'mis Ebrel', 'mis Me',
+    'mis Metheven', 'mis Gortheren', 'mis Est', 'mis Gwynngala', 'mis Hedra',
+    'mis Du', 'mis Kevardhu'],
+  STANDALONEMONTHS: ['mis Genver', 'mis Hwevrer', 'mis Meurth', 'mis Ebrel',
+    'mis Me', 'mis Metheven', 'mis Gortheren', 'mis Est', 'mis Gwynngala',
+    'mis Hedra', 'mis Du', 'mis Kevardhu'],
+  SHORTMONTHS: ['Gen', 'Hwe', 'Meu', 'Ebr', 'Me', 'Met', 'Gor', 'Est', 'Gwn',
     'Hed', 'Du', 'Kev'],
-  STANDALONESHORTMONTHS: ['Gen', 'Whe', 'Mer', 'Ebr', 'Me', 'Efn', 'Gor', 'Est',
+  STANDALONESHORTMONTHS: ['Gen', 'Hwe', 'Meu', 'Ebr', 'Me', 'Met', 'Gor', 'Est',
     'Gwn', 'Hed', 'Du', 'Kev'],
-  WEEKDAYS: ['De Sul', 'De Lun', 'De Merth', 'De Merher', 'De Yow', 'De Gwener',
-    'De Sadorn'],
-  STANDALONEWEEKDAYS: ['De Sul', 'De Lun', 'De Merth', 'De Merher', 'De Yow',
-    'De Gwener', 'De Sadorn'],
+  WEEKDAYS: ['dy Sul', 'dy Lun', 'dy Meurth', 'dy Merher', 'dy Yow',
+    'dy Gwener', 'dy Sadorn'],
+  STANDALONEWEEKDAYS: ['dy Sul', 'dy Lun', 'dy Meurth', 'dy Merher', 'dy Yow',
+    'dy Gwener', 'dy Sadorn'],
   SHORTWEEKDAYS: ['Sul', 'Lun', 'Mth', 'Mhr', 'Yow', 'Gwe', 'Sad'],
   STANDALONESHORTWEEKDAYS: ['Sul', 'Lun', 'Mth', 'Mhr', 'Yow', 'Gwe', 'Sad'],
   NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
@@ -14522,7 +14229,7 @@ goog.i18n.DateTimeSymbols_my_MM = {
     'တတိယ သုံးလပတ်',
     'စတုတ္ထ သုံးလပတ်'],
   AMPMS: ['နံနက်', 'ညနေ'],
-  DATEFORMATS: ['EEEE, dd MMMM y', 'd MMMM y', 'd MMM y', 'dd-MM-yy'],
+  DATEFORMATS: ['EEEE၊ dd MMMM y', 'd MMMM y', 'd MMM y', 'dd-MM-yy'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1}မှာ {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -14708,11 +14415,11 @@ goog.i18n.DateTimeSymbols_ne_IN = {
     '१०', '११', '१२'],
   STANDALONENARROWMONTHS: ['१', '२', '३', '४', '५', '६', '७',
     '८', '९', '१०', '११', '१२'],
-  MONTHS: ['जनवरी', 'फरवरी', 'मार्च',
-    'अप्रेल', 'मई', 'जुन', 'जुलाई',
-    'अगस्त', 'सेप्टेम्बर',
+  MONTHS: ['जनवरी', 'फेब्रुअरी', 'मार्च',
+    'अप्रिल', 'मई', 'जुन', 'जुलाई',
+    'अगस्ट', 'सेप्टेम्बर',
     'अक्टोबर', 'नोभेम्बर',
-    'दिसम्बर'],
+    'डिसेम्बर'],
   STANDALONEMONTHS: ['जनवरी', 'फेब्रुअरी',
     'मार्च', 'अप्रिल', 'मे', 'जुन',
     'जुलाई', 'अगस्ट', 'सेप्टेम्बर',
@@ -14728,11 +14435,11 @@ goog.i18n.DateTimeSymbols_ne_IN = {
     'जुलाई', 'अगस्ट', 'सेप्टेम्बर',
     'अक्टोबर', 'नोभेम्बर',
     'डिसेम्बर'],
-  WEEKDAYS: ['आइतवार', 'सोमवार',
-    'मङ्गलवार', 'बुधवार', 'बिहीवार',
-    'शुक्रवार', 'शनिवार'],
+  WEEKDAYS: ['आइतबार', 'सोमबार',
+    'मङ्गलबार', 'बुधबार', 'बिहिबार',
+    'शुक्रबार', 'शनिबार'],
   STANDALONEWEEKDAYS: ['आइतबार', 'सोमबार',
-    'मङ्गलबार', 'बुधबार', 'बिहीबार',
+    'मङ्गलबार', 'बुधबार', 'बिहिबार',
     'शुक्रबार', 'शनिबार'],
   SHORTWEEKDAYS: ['आइत', 'सोम', 'मङ्गल', 'बुध',
     'बिही', 'शुक्र', 'शनि'],
@@ -14768,7 +14475,7 @@ goog.i18n.DateTimeSymbols_ne_NP = {
   STANDALONENARROWMONTHS: ['१', '२', '३', '४', '५', '६', '७',
     '८', '९', '१०', '११', '१२'],
   MONTHS: ['जनवरी', 'फेब्रुअरी', 'मार्च',
-    'अप्रिल', 'मे', 'जुन', 'जुलाई',
+    'अप्रिल', 'मई', 'जुन', 'जुलाई',
     'अगस्ट', 'सेप्टेम्बर',
     'अक्टोबर', 'नोभेम्बर',
     'डिसेम्बर'],
@@ -14788,10 +14495,10 @@ goog.i18n.DateTimeSymbols_ne_NP = {
     'अक्टोबर', 'नोभेम्बर',
     'डिसेम्बर'],
   WEEKDAYS: ['आइतबार', 'सोमबार',
-    'मङ्गलबार', 'बुधबार', 'बिहीबार',
+    'मङ्गलबार', 'बुधबार', 'बिहिबार',
     'शुक्रबार', 'शनिबार'],
   STANDALONEWEEKDAYS: ['आइतबार', 'सोमबार',
-    'मङ्गलबार', 'बुधबार', 'बिहीबार',
+    'मङ्गलबार', 'बुधबार', 'बिहिबार',
     'शुक्रबार', 'शनिबार'],
   SHORTWEEKDAYS: ['आइत', 'सोम', 'मङ्गल', 'बुध',
     'बिही', 'शुक्र', 'शनि'],
@@ -14805,8 +14512,7 @@ goog.i18n.DateTimeSymbols_ne_NP = {
     'चौथो सत्र'],
   QUARTERS: ['पहिलो सत्र', 'दोस्रो सत्र',
     'तेस्रो सत्र', 'चौथो सत्र'],
-  AMPMS: ['पूर्व मध्यान्ह',
-    'उत्तर मध्यान्ह'],
+  AMPMS: ['पूर्वाह्न', 'अपराह्न'],
   DATEFORMATS: ['y MMMM d, EEEE', 'y MMMM d', 'y MMM d', 'y-MM-dd'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1}, {0}', '{1}, {0}'],
@@ -14881,7 +14587,7 @@ goog.i18n.DateTimeSymbols_nl_BE = {
   SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
   QUARTERS: ['1e kwartaal', '2e kwartaal', '3e kwartaal', '4e kwartaal'],
   AMPMS: ['a.m.', 'p.m.'],
-  DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'd-MMM-y', 'd/MM/yy'],
+  DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'd MMM y', 'd/MM/yy'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -15229,94 +14935,6 @@ goog.i18n.DateTimeSymbols_nnh = {
 goog.i18n.DateTimeSymbols_nnh_CM = goog.i18n.DateTimeSymbols_nnh;
 
 
-/**
- * Date/time formatting symbols for locale nr.
- */
-goog.i18n.DateTimeSymbols_nr = {
-  ERAS: ['BC', 'AD'],
-  ERANAMES: ['BC', 'AD'],
-  NARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  STANDALONENARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
-    '11', '12'],
-  MONTHS: ['Janabari', 'uFeberbari', 'uMatjhi', 'u-Apreli', 'Meyi', 'Juni',
-    'Julayi', 'Arhostosi', 'Septemba', 'Oktoba', 'Usinyikhaba', 'Disemba'],
-  STANDALONEMONTHS: ['Janabari', 'uFeberbari', 'uMatjhi', 'u-Apreli', 'Meyi',
-    'Juni', 'Julayi', 'Arhostosi', 'Septemba', 'Oktoba', 'Usinyikhaba',
-    'Disemba'],
-  SHORTMONTHS: ['Jan', 'Feb', 'Mat', 'Apr', 'Mey', 'Jun', 'Jul', 'Arh', 'Sep',
-    'Okt', 'Usi', 'Dis'],
-  STANDALONESHORTMONTHS: ['Jan', 'Feb', 'Mat', 'Apr', 'Mey', 'Jun', 'Jul',
-    'Arh', 'Sep', 'Okt', 'Usi', 'Dis'],
-  WEEKDAYS: ['uSonto', 'uMvulo', 'uLesibili', 'Lesithathu', 'uLesine',
-    'ngoLesihlanu', 'umGqibelo'],
-  STANDALONEWEEKDAYS: ['uSonto', 'uMvulo', 'uLesibili', 'Lesithathu', 'uLesine',
-    'ngoLesihlanu', 'umGqibelo'],
-  SHORTWEEKDAYS: ['Son', 'Mvu', 'Bil', 'Tha', 'Ne', 'Hla', 'Gqi'],
-  STANDALONESHORTWEEKDAYS: ['Son', 'Mvu', 'Bil', 'Tha', 'Ne', 'Hla', 'Gqi'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  QUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['y MMMM d, EEEE', 'y MMMM d', 'y MMM d', 'y-MM-dd'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 6,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
-};
-
-
-/**
- * Date/time formatting symbols for locale nr_ZA.
- */
-goog.i18n.DateTimeSymbols_nr_ZA = goog.i18n.DateTimeSymbols_nr;
-
-
-/**
- * Date/time formatting symbols for locale nso.
- */
-goog.i18n.DateTimeSymbols_nso = {
-  ERAS: ['BCE', 'CE'],
-  ERANAMES: ['BCE', 'CE'],
-  NARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  STANDALONENARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
-    '11', '12'],
-  MONTHS: ['Janaware', 'Feberware', 'Matšhe', 'Aporele', 'Mei', 'June',
-    'Julae', 'Agostose', 'Setemere', 'Oktobore', 'Nofemere', 'Disemere'],
-  STANDALONEMONTHS: ['Janaware', 'Feberware', 'Matšhe', 'Aporele', 'Mei',
-    'June', 'Julae', 'Agostose', 'Setemere', 'Oktobore', 'Nofemere',
-    'Disemere'],
-  SHORTMONTHS: ['Jan', 'Feb', 'Mat', 'Apo', 'Mei', 'Jun', 'Jul', 'Ago', 'Set',
-    'Okt', 'Nof', 'Dis'],
-  STANDALONESHORTMONTHS: ['Jan', 'Feb', 'Mat', 'Apo', 'Mei', 'Jun', 'Jul',
-    'Ago', 'Set', 'Okt', 'Nof', 'Dis'],
-  WEEKDAYS: ['Sontaga', 'Mosupalogo', 'Labobedi', 'Laboraro', 'Labone',
-    'Labohlano', 'Mokibelo'],
-  STANDALONEWEEKDAYS: ['Sontaga', 'Mosupalogo', 'Labobedi', 'Laboraro',
-    'Labone', 'Labohlano', 'Mokibelo'],
-  SHORTWEEKDAYS: ['Son', 'Mos', 'Bed', 'Rar', 'Ne', 'Hla', 'Mok'],
-  STANDALONESHORTWEEKDAYS: ['Son', 'Mos', 'Bed', 'Rar', 'Ne', 'Hla', 'Mok'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  QUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['y MMMM d, EEEE', 'y MMMM d', 'y MMM d', 'y-MM-dd'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 6,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
-};
-
-
-/**
- * Date/time formatting symbols for locale nso_ZA.
- */
-goog.i18n.DateTimeSymbols_nso_ZA = goog.i18n.DateTimeSymbols_nso;
-
-
 /**
  * Date/time formatting symbols for locale nus.
  */
@@ -15717,7 +15335,7 @@ goog.i18n.DateTimeSymbols_pl_PL = {
   SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
   QUARTERS: ['I kwartał', 'II kwartał', 'III kwartał', 'IV kwartał'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd.MM.y'],
+  DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'dd.MM.y', 'dd.MM.y'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -15787,12 +15405,12 @@ goog.i18n.DateTimeSymbols_pt_AO = {
     'N', 'D'],
   MONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho',
     'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  STANDALONEMONTHS: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
-    'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  STANDALONEMONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho',
+    'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
   SHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set',
     'out', 'nov', 'dez'],
-  STANDALONESHORTMONTHS: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul',
-    'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+  STANDALONESHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul',
+    'ago', 'set', 'out', 'nov', 'dez'],
   WEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira', 'quarta-feira',
     'quinta-feira', 'sexta-feira', 'sábado'],
   STANDALONEWEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira',
@@ -15827,12 +15445,12 @@ goog.i18n.DateTimeSymbols_pt_CV = {
     'N', 'D'],
   MONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho',
     'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  STANDALONEMONTHS: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
-    'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  STANDALONEMONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho',
+    'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
   SHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set',
     'out', 'nov', 'dez'],
-  STANDALONESHORTMONTHS: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul',
-    'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+  STANDALONESHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul',
+    'ago', 'set', 'out', 'nov', 'dez'],
   WEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira', 'quarta-feira',
     'quinta-feira', 'sexta-feira', 'sábado'],
   STANDALONEWEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira',
@@ -15867,12 +15485,12 @@ goog.i18n.DateTimeSymbols_pt_GW = {
     'N', 'D'],
   MONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho',
     'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  STANDALONEMONTHS: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
-    'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  STANDALONEMONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho',
+    'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
   SHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set',
     'out', 'nov', 'dez'],
-  STANDALONESHORTMONTHS: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul',
-    'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+  STANDALONESHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul',
+    'ago', 'set', 'out', 'nov', 'dez'],
   WEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira', 'quarta-feira',
     'quinta-feira', 'sexta-feira', 'sábado'],
   STANDALONEWEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira',
@@ -15907,12 +15525,12 @@ goog.i18n.DateTimeSymbols_pt_MO = {
     'N', 'D'],
   MONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho',
     'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  STANDALONEMONTHS: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
-    'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  STANDALONEMONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho',
+    'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
   SHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set',
     'out', 'nov', 'dez'],
-  STANDALONESHORTMONTHS: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul',
-    'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+  STANDALONESHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul',
+    'ago', 'set', 'out', 'nov', 'dez'],
   WEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira', 'quarta-feira',
     'quinta-feira', 'sexta-feira', 'sábado'],
   STANDALONEWEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira',
@@ -15947,12 +15565,12 @@ goog.i18n.DateTimeSymbols_pt_MZ = {
     'N', 'D'],
   MONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho',
     'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  STANDALONEMONTHS: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
-    'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  STANDALONEMONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho',
+    'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
   SHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set',
     'out', 'nov', 'dez'],
-  STANDALONESHORTMONTHS: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul',
-    'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+  STANDALONESHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul',
+    'ago', 'set', 'out', 'nov', 'dez'],
   WEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira', 'quarta-feira',
     'quinta-feira', 'sexta-feira', 'sábado'],
   STANDALONEWEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira',
@@ -15987,12 +15605,12 @@ goog.i18n.DateTimeSymbols_pt_ST = {
     'N', 'D'],
   MONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho',
     'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  STANDALONEMONTHS: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
-    'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  STANDALONEMONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho',
+    'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
   SHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set',
     'out', 'nov', 'dez'],
-  STANDALONESHORTMONTHS: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul',
-    'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+  STANDALONESHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul',
+    'ago', 'set', 'out', 'nov', 'dez'],
   WEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira', 'quarta-feira',
     'quinta-feira', 'sexta-feira', 'sábado'],
   STANDALONEWEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira',
@@ -16027,12 +15645,12 @@ goog.i18n.DateTimeSymbols_pt_TL = {
     'N', 'D'],
   MONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho',
     'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  STANDALONEMONTHS: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
-    'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  STANDALONEMONTHS: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho',
+    'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
   SHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set',
     'out', 'nov', 'dez'],
-  STANDALONESHORTMONTHS: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul',
-    'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+  STANDALONESHORTMONTHS: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul',
+    'ago', 'set', 'out', 'nov', 'dez'],
   WEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira', 'quarta-feira',
     'quinta-feira', 'sexta-feira', 'sábado'],
   STANDALONEWEEKDAYS: ['domingo', 'segunda-feira', 'terça-feira',
@@ -16601,7 +16219,8 @@ goog.i18n.DateTimeSymbols_ru_UA = {
   QUARTERS: ['1-й квартал', '2-й квартал',
     '3-й квартал', '4-й квартал'],
   AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['EEEE, d MMMM y \'г\'.', 'd MMMM y', 'd MMM y', 'dd.MM.yy'],
+  DATEFORMATS: ['EEEE, d MMMM y \'г\'.', 'd MMMM y \'г\'.', 'd MMM y \'г\'.',
+    'dd.MM.yy'],
   TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1}, {0}', '{1}, {0}', '{1}, {0}', '{1}, {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -17305,7 +16924,7 @@ goog.i18n.DateTimeSymbols_sl_SI = {
     '4. četrtletje'],
   AMPMS: ['dop.', 'pop.'],
   DATEFORMATS: ['EEEE, dd. MMMM y', 'dd. MMMM y', 'd. MMM y', 'd. MM. yy'],
-  TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -17642,8 +17261,8 @@ goog.i18n.DateTimeSymbols_sr_Cyrl_BA = {
   STANDALONENARROWMONTHS: ['ј', 'ф', 'м', 'а', 'м', 'ј', 'ј', 'а', 'с',
     'о', 'н', 'д'],
   MONTHS: ['јануар', 'фебруар', 'март', 'април', 'мај',
-    'јуни', 'јули', 'август', 'септембар',
-    'октобар', 'новембар', 'децембар'],
+    'јун', 'јул', 'август', 'септембар', 'октобар',
+    'новембар', 'децембар'],
   STANDALONEMONTHS: ['јануар', 'фебруар', 'март', 'април',
     'мај', 'јун', 'јул', 'август', 'септембар',
     'октобар', 'новембар', 'децембар'],
@@ -17651,11 +17270,11 @@ goog.i18n.DateTimeSymbols_sr_Cyrl_BA = {
     'јул', 'авг', 'сеп', 'окт', 'нов', 'дец'],
   STANDALONESHORTMONTHS: ['јан', 'феб', 'мар', 'апр', 'мај',
     'јун', 'јул', 'авг', 'сеп', 'окт', 'нов', 'дец'],
-  WEEKDAYS: ['недеља', 'понедељак', 'уторак',
-    'сриједа', 'четвртак', 'петак', 'субота'],
+  WEEKDAYS: ['недеља', 'понедељак', 'уторак', 'среда',
+    'четвртак', 'петак', 'субота'],
   STANDALONEWEEKDAYS: ['недеља', 'понедељак', 'уторак',
     'среда', 'четвртак', 'петак', 'субота'],
-  SHORTWEEKDAYS: ['нед', 'пон', 'уто', 'сри', 'чет', 'пет',
+  SHORTWEEKDAYS: ['нед', 'пон', 'уто', 'сре', 'чет', 'пет',
     'суб'],
   STANDALONESHORTWEEKDAYS: ['нед', 'пон', 'уто', 'сре', 'чет',
     'пет', 'суб'],
@@ -17665,10 +17284,8 @@ goog.i18n.DateTimeSymbols_sr_Cyrl_BA = {
   QUARTERS: ['Прво тромесечје', 'Друго тромесечје',
     'Треће тромесечје', 'Четврто тромесечје'],
   AMPMS: ['пре подне', 'по подне'],
-  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'y-MM-dd', 'yy-MM-dd'],
-  TIMEFORMATS: [
-    'HH \'часова\', mm \'минута\', ss \'секунди\' zzzz',
-    'HH.mm.ss z', 'HH:mm:ss', 'HH:mm'],
+  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd.MM.y.', 'd.M.yy.'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -17695,9 +17312,9 @@ goog.i18n.DateTimeSymbols_sr_Cyrl_XK = goog.i18n.DateTimeSymbols_sr_Cyrl;
 
 
 /**
- * Date/time formatting symbols for locale sr_Latn.
+ * Date/time formatting symbols for locale sr_Latn_BA.
  */
-goog.i18n.DateTimeSymbols_sr_Latn = {
+goog.i18n.DateTimeSymbols_sr_Latn_BA = {
   ERAS: ['p. n. e.', 'n. e.'],
   ERANAMES: ['Pre nove ere', 'Nove ere'],
   NARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
@@ -17724,7 +17341,7 @@ goog.i18n.DateTimeSymbols_sr_Latn = {
     'Četvrto tromesečje'],
   AMPMS: ['pre podne', 'po podne'],
   DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd.MM.y.', 'd.M.yy.'],
-  TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -17733,27 +17350,27 @@ goog.i18n.DateTimeSymbols_sr_Latn = {
 
 
 /**
- * Date/time formatting symbols for locale sr_Latn_BA.
+ * Date/time formatting symbols for locale sr_Latn_ME.
  */
-goog.i18n.DateTimeSymbols_sr_Latn_BA = {
+goog.i18n.DateTimeSymbols_sr_Latn_ME = {
   ERAS: ['p. n. e.', 'n. e.'],
   ERANAMES: ['Pre nove ere', 'Nove ere'],
   NARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
   STANDALONENARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o',
     'n', 'd'],
-  MONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'juni', 'juli',
-    'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+  MONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust',
+    'septembar', 'oktobar', 'novembar', 'decembar'],
   STANDALONEMONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul',
     'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
   SHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'avg', 'sep',
     'okt', 'nov', 'dec'],
   STANDALONESHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul',
     'avg', 'sep', 'okt', 'nov', 'dec'],
-  WEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'srijeda', 'četvrtak', 'petak',
+  WEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak', 'petak',
     'subota'],
   STANDALONEWEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak',
     'petak', 'subota'],
-  SHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
+  SHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sre', 'čet', 'pet', 'sub'],
   STANDALONESHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sre', 'čet', 'pet', 'sub'],
   NARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
   STANDALONENARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
@@ -17761,9 +17378,8 @@ goog.i18n.DateTimeSymbols_sr_Latn_BA = {
   QUARTERS: ['Prvo tromesečje', 'Drugo tromesečje', 'Treće tromesečje',
     'Četvrto tromesečje'],
   AMPMS: ['pre podne', 'po podne'],
-  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'y-MM-dd', 'yy-MM-dd'],
-  TIMEFORMATS: ['HH \'časova\', mm \'minuta\', ss \'sekundi\' zzzz',
-    'HH.mm.ss z', 'HH:mm:ss', 'HH:mm'],
+  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd.MM.y.', 'd.M.yy.'],
+  TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -17771,107 +17387,75 @@ goog.i18n.DateTimeSymbols_sr_Latn_BA = {
 };
 
 
-/**
- * Date/time formatting symbols for locale sr_Latn_ME.
- */
-goog.i18n.DateTimeSymbols_sr_Latn_ME = goog.i18n.DateTimeSymbols_sr_Latn;
-
-
 /**
  * Date/time formatting symbols for locale sr_Latn_RS.
  */
-goog.i18n.DateTimeSymbols_sr_Latn_RS = goog.i18n.DateTimeSymbols_sr_Latn;
-
-
-/**
- * Date/time formatting symbols for locale sr_Latn_XK.
- */
-goog.i18n.DateTimeSymbols_sr_Latn_XK = goog.i18n.DateTimeSymbols_sr_Latn;
-
-
-/**
- * Date/time formatting symbols for locale ss.
- */
-goog.i18n.DateTimeSymbols_ss = {
-  ERAS: ['BCE', 'CE'],
-  ERANAMES: ['BCE', 'CE'],
-  NARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  STANDALONENARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
-    '11', '12'],
-  MONTHS: ['Bhimbidvwane', 'iNdlovana', 'iNdlovu-lenkhulu', 'Mabasa',
-    'iNkhwekhweti', 'iNhlaba', 'Kholwane', 'iNgci', 'iNyoni', 'iMphala',
-    'Lweti', 'iNgongoni'],
-  STANDALONEMONTHS: ['Bhimbidvwane', 'iNdlovana', 'iNdlovu-lenkhulu', 'Mabasa',
-    'iNkhwekhweti', 'iNhlaba', 'Kholwane', 'iNgci', 'iNyoni', 'iMphala',
-    'Lweti', 'iNgongoni'],
-  SHORTMONTHS: ['Bhi', 'Van', 'Vol', 'Mab', 'Nkh', 'Nhl', 'Kho', 'Ngc', 'Nyo',
-    'Mph', 'Lwe', 'Ngo'],
-  STANDALONESHORTMONTHS: ['Bhi', 'Van', 'Vol', 'Mab', 'Nkh', 'Nhl', 'Kho',
-    'Ngc', 'Nyo', 'Mph', 'Lwe', 'Ngo'],
-  WEEKDAYS: ['Lisontfo', 'uMsombuluko', 'Lesibili', 'Lesitsatfu', 'Lesine',
-    'Lesihlanu', 'uMgcibelo'],
-  STANDALONEWEEKDAYS: ['Lisontfo', 'uMsombuluko', 'Lesibili', 'Lesitsatfu',
-    'Lesine', 'Lesihlanu', 'uMgcibelo'],
-  SHORTWEEKDAYS: ['Son', 'Mso', 'Bil', 'Tsa', 'Ne', 'Hla', 'Mgc'],
-  STANDALONESHORTWEEKDAYS: ['Son', 'Mso', 'Bil', 'Tsa', 'Ne', 'Hla', 'Mgc'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  QUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['y MMMM d, EEEE', 'y MMMM d', 'y MMM d', 'y-MM-dd'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+goog.i18n.DateTimeSymbols_sr_Latn_RS = {
+  ERAS: ['p. n. e.', 'n. e.'],
+  ERANAMES: ['Pre nove ere', 'Nove ere'],
+  NARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  STANDALONENARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o',
+    'n', 'd'],
+  MONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust',
+    'septembar', 'oktobar', 'novembar', 'decembar'],
+  STANDALONEMONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul',
+    'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+  SHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'avg', 'sep',
+    'okt', 'nov', 'dec'],
+  STANDALONESHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul',
+    'avg', 'sep', 'okt', 'nov', 'dec'],
+  WEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak', 'petak',
+    'subota'],
+  STANDALONEWEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak',
+    'petak', 'subota'],
+  SHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sre', 'čet', 'pet', 'sub'],
+  STANDALONESHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sre', 'čet', 'pet', 'sub'],
+  NARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
+  STANDALONENARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
+  SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
+  QUARTERS: ['Prvo tromesečje', 'Drugo tromesečje', 'Treće tromesečje',
+    'Četvrto tromesečje'],
+  AMPMS: ['pre podne', 'po podne'],
+  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd.MM.y.', 'd.M.yy.'],
+  TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 6,
+  FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
+  FIRSTWEEKCUTOFFDAY: 6
 };
 
 
 /**
- * Date/time formatting symbols for locale ss_SZ.
- */
-goog.i18n.DateTimeSymbols_ss_SZ = goog.i18n.DateTimeSymbols_ss;
-
-
-/**
- * Date/time formatting symbols for locale ss_ZA.
- */
-goog.i18n.DateTimeSymbols_ss_ZA = goog.i18n.DateTimeSymbols_ss;
-
-
-/**
- * Date/time formatting symbols for locale ssy.
+ * Date/time formatting symbols for locale sr_Latn_XK.
  */
-goog.i18n.DateTimeSymbols_ssy = {
-  ERAS: ['Yaasuusuk Duma', 'Yaasuusuk Wadir'],
-  ERANAMES: ['Yaasuusuk Duma', 'Yaasuusuk Wadir'],
-  NARROWMONTHS: ['Q', 'N', 'C', 'A', 'C', 'Q', 'Q', 'L', 'W', 'D', 'X', 'K'],
-  STANDALONENARROWMONTHS: ['Q', 'N', 'C', 'A', 'C', 'Q', 'Q', 'L', 'W', 'D',
-    'X', 'K'],
-  MONTHS: ['Qunxa Garablu', 'Kudo', 'Ciggilta Kudo', 'Agda Baxis', 'Caxah Alsa',
-    'Qasa Dirri', 'Qado Dirri', 'Liiqen', 'Waysu', 'Diteli', 'Ximoli',
-    'Kaxxa Garablu'],
-  STANDALONEMONTHS: ['Qunxa Garablu', 'Kudo', 'Ciggilta Kudo', 'Agda Baxis',
-    'Caxah Alsa', 'Qasa Dirri', 'Qado Dirri', 'Liiqen', 'Waysu', 'Diteli',
-    'Ximoli', 'Kaxxa Garablu'],
-  SHORTMONTHS: ['Qun', 'Nah', 'Cig', 'Agd', 'Cax', 'Qas', 'Qad', 'Leq', 'Way',
-    'Dit', 'Xim', 'Kax'],
-  STANDALONESHORTMONTHS: ['Qun', 'Nah', 'Cig', 'Agd', 'Cax', 'Qas', 'Qad',
-    'Leq', 'Way', 'Dit', 'Xim', 'Kax'],
-  WEEKDAYS: ['Naba Sambat', 'Sani', 'Salus', 'Rabuq', 'Camus', 'Jumqata',
-    'Qunxa Sambat'],
-  STANDALONEWEEKDAYS: ['Naba Sambat', 'Sani', 'Salus', 'Rabuq', 'Camus',
-    'Jumqata', 'Qunxa Sambat'],
-  SHORTWEEKDAYS: ['Nab', 'San', 'Sal', 'Rab', 'Cam', 'Jum', 'Qun'],
-  STANDALONESHORTWEEKDAYS: ['Nab', 'San', 'Sal', 'Rab', 'Cam', 'Jum', 'Qun'],
-  NARROWWEEKDAYS: ['N', 'S', 'S', 'R', 'C', 'J', 'Q'],
-  STANDALONENARROWWEEKDAYS: ['N', 'S', 'S', 'R', 'C', 'J', 'Q'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  QUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  AMPMS: ['saaku', 'carra'],
-  DATEFORMATS: ['EEEE, MMMM dd, y', 'dd MMMM y', 'dd-MMM-y', 'dd/MM/yy'],
-  TIMEFORMATS: ['h:mm:ss a zzzz', 'h:mm:ss a z', 'h:mm:ss a', 'h:mm a'],
+goog.i18n.DateTimeSymbols_sr_Latn_XK = {
+  ERAS: ['p. n. e.', 'n. e.'],
+  ERANAMES: ['Pre nove ere', 'Nove ere'],
+  NARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o', 'n', 'd'],
+  STANDALONENARROWMONTHS: ['j', 'f', 'm', 'a', 'm', 'j', 'j', 'a', 's', 'o',
+    'n', 'd'],
+  MONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust',
+    'septembar', 'oktobar', 'novembar', 'decembar'],
+  STANDALONEMONTHS: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul',
+    'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+  SHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'avg', 'sep',
+    'okt', 'nov', 'dec'],
+  STANDALONESHORTMONTHS: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul',
+    'avg', 'sep', 'okt', 'nov', 'dec'],
+  WEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak', 'petak',
+    'subota'],
+  STANDALONEWEEKDAYS: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak',
+    'petak', 'subota'],
+  SHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sre', 'čet', 'pet', 'sub'],
+  STANDALONESHORTWEEKDAYS: ['ned', 'pon', 'uto', 'sre', 'čet', 'pet', 'sub'],
+  NARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
+  STANDALONENARROWWEEKDAYS: ['n', 'p', 'u', 's', 'č', 'p', 's'],
+  SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
+  QUARTERS: ['Prvo tromesečje', 'Drugo tromesečje', 'Treće tromesečje',
+    'Četvrto tromesečje'],
+  AMPMS: ['pre podne', 'po podne'],
+  DATEFORMATS: ['EEEE, dd. MMMM y.', 'dd. MMMM y.', 'dd.MM.y.', 'd.M.yy.'],
+  TIMEFORMATS: ['HH.mm.ss zzzz', 'HH.mm.ss z', 'HH.mm.ss', 'HH.mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
   WEEKENDRANGE: [5, 6],
@@ -17879,12 +17463,6 @@ goog.i18n.DateTimeSymbols_ssy = {
 };
 
 
-/**
- * Date/time formatting symbols for locale ssy_ER.
- */
-goog.i18n.DateTimeSymbols_ssy_ER = goog.i18n.DateTimeSymbols_ssy;
-
-
 /**
  * Date/time formatting symbols for locale sv_AX.
  */
@@ -17952,8 +17530,7 @@ goog.i18n.DateTimeSymbols_sv_FI = {
   QUARTERS: ['1:a kvartalet', '2:a kvartalet', '3:e kvartalet',
     '4:e kvartalet'],
   AMPMS: ['fm', 'em'],
-  DATEFORMATS: ['EEEE\'en\' \'den\' d:\'e\' MMMM y', 'd MMMM y', 'd MMM y',
-    'dd-MM-y'],
+  DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'd MMM y', 'dd-MM-y'],
   TIMEFORMATS: ['\'kl\'. HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 0,
@@ -18000,6 +17577,46 @@ goog.i18n.DateTimeSymbols_sv_SE = {
 };
 
 
+/**
+ * Date/time formatting symbols for locale sw_CD.
+ */
+goog.i18n.DateTimeSymbols_sw_CD = {
+  ERAS: ['BC', 'AD'],
+  ERANAMES: ['Kabla ya Kristo', 'Baada ya Kristo'],
+  NARROWMONTHS: ['J', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D'],
+  STANDALONENARROWMONTHS: ['k', 'p', 't', 'i', 't', 's', 's', 'm', 't', 'k',
+    'm', 'm'],
+  MONTHS: ['mwezi ya kwanja', 'mwezi ya pili', 'mwezi ya tatu', 'mwezi ya ine',
+    'mwezi ya tanu', 'mwezi ya sita', 'mwezi ya saba', 'mwezi ya munane',
+    'mwezi ya tisa', 'mwezi ya kumi', 'mwezi ya kumi na moya',
+    'mwezi ya kumi ya mbili'],
+  STANDALONEMONTHS: ['Januari', 'Februari', 'Machi', 'Aprili', 'Mei', 'Juni',
+    'Julai', 'Agosti', 'Septemba', 'Oktoba', 'Novemba', 'Desemba'],
+  SHORTMONTHS: ['mkw', 'mpi', 'mtu', 'min', 'mtn', 'mst', 'msb', 'mun', 'mts',
+    'mku', 'mkm', 'mkb'],
+  STANDALONESHORTMONTHS: ['Jan', 'Feb', 'Mac', 'Apr', 'Mei', 'Jun', 'Jul',
+    'Ago', 'Sep', 'Okt', 'Nov', 'Des'],
+  WEEKDAYS: ['siku ya yenga', 'siku ya kwanza', 'siku ya pili', 'siku ya tatu',
+    'siku ya ine', 'siku ya tanu', 'siku ya sita'],
+  STANDALONEWEEKDAYS: ['Jumapili', 'Jumatatu', 'Jumanne', 'Jumatano',
+    'Alhamisi', 'Ijumaa', 'Jumamosi'],
+  SHORTWEEKDAYS: ['yen', 'kwa', 'pil', 'tat', 'ine', 'tan', 'sit'],
+  STANDALONESHORTWEEKDAYS: ['Jumapili', 'Jumatatu', 'Jumanne', 'Jumatano',
+    'Alhamisi', 'Ijumaa', 'Jumamosi'],
+  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
+  STANDALONENARROWWEEKDAYS: ['y', 'k', 'p', 't', 'i', 't', 's'],
+  SHORTQUARTERS: ['R1', 'R2', 'R3', 'R4'],
+  QUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
+  AMPMS: ['ya asubuyi', 'ya muchana'],
+  DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'd MMM y', 'd/M/y'],
+  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
+  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
+  FIRSTDAYOFWEEK: 0,
+  WEEKENDRANGE: [5, 6],
+  FIRSTWEEKCUTOFFDAY: 6
+};
+
+
 /**
  * Date/time formatting symbols for locale sw_KE.
  */
@@ -18027,7 +17644,7 @@ goog.i18n.DateTimeSymbols_sw_KE = {
     'Alhamisi', 'Ijumaa', 'Jumamosi'],
   NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
+  SHORTQUARTERS: ['R1', 'R2', 'R3', 'R4'],
   QUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
   AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
@@ -18066,7 +17683,7 @@ goog.i18n.DateTimeSymbols_sw_TZ = {
     'Alhamisi', 'Ijumaa', 'Jumamosi'],
   NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
+  SHORTQUARTERS: ['R1', 'R2', 'R3', 'R4'],
   QUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
   AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
@@ -18105,7 +17722,7 @@ goog.i18n.DateTimeSymbols_sw_UG = {
     'Alhamisi', 'Ijumaa', 'Jumamosi'],
   NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
+  SHORTQUARTERS: ['R1', 'R2', 'R3', 'R4'],
   QUARTERS: ['Robo ya 1', 'Robo ya 2', 'Robo ya 3', 'Robo ya 4'],
   AMPMS: ['AM', 'PM'],
   DATEFORMATS: ['EEEE, d MMMM y', 'd MMMM y', 'd MMM y', 'dd/MM/y'],
@@ -18117,53 +17734,6 @@ goog.i18n.DateTimeSymbols_sw_UG = {
 };
 
 
-/**
- * Date/time formatting symbols for locale swc.
- */
-goog.i18n.DateTimeSymbols_swc = {
-  ERAS: ['mbele ya Y', 'kisha ya Y'],
-  ERANAMES: ['mbele ya Yezu Kristo', 'kisha ya Yezu Kristo'],
-  NARROWMONTHS: ['k', 'p', 't', 'i', 't', 's', 's', 'm', 't', 'k', 'm', 'm'],
-  STANDALONENARROWMONTHS: ['k', 'p', 't', 'i', 't', 's', 's', 'm', 't', 'k',
-    'm', 'm'],
-  MONTHS: ['mwezi ya kwanja', 'mwezi ya pili', 'mwezi ya tatu', 'mwezi ya ine',
-    'mwezi ya tanu', 'mwezi ya sita', 'mwezi ya saba', 'mwezi ya munane',
-    'mwezi ya tisa', 'mwezi ya kumi', 'mwezi ya kumi na moya',
-    'mwezi ya kumi ya mbili'],
-  STANDALONEMONTHS: ['mwezi ya kwanja', 'mwezi ya pili', 'mwezi ya tatu',
-    'mwezi ya ine', 'mwezi ya tanu', 'mwezi ya sita', 'mwezi ya saba',
-    'mwezi ya munane', 'mwezi ya tisa', 'mwezi ya kumi',
-    'mwezi ya kumi na moya', 'mwezi ya kumi ya mbili'],
-  SHORTMONTHS: ['mkw', 'mpi', 'mtu', 'min', 'mtn', 'mst', 'msb', 'mun', 'mts',
-    'mku', 'mkm', 'mkb'],
-  STANDALONESHORTMONTHS: ['mkw', 'mpi', 'mtu', 'min', 'mtn', 'mst', 'msb',
-    'mun', 'mts', 'mku', 'mkm', 'mkb'],
-  WEEKDAYS: ['siku ya yenga', 'siku ya kwanza', 'siku ya pili', 'siku ya tatu',
-    'siku ya ine', 'siku ya tanu', 'siku ya sita'],
-  STANDALONEWEEKDAYS: ['siku ya yenga', 'siku ya kwanza', 'siku ya pili',
-    'siku ya tatu', 'siku ya ine', 'siku ya tanu', 'siku ya sita'],
-  SHORTWEEKDAYS: ['yen', 'kwa', 'pil', 'tat', 'ine', 'tan', 'sit'],
-  STANDALONESHORTWEEKDAYS: ['yen', 'kwa', 'pil', 'tat', 'ine', 'tan', 'sit'],
-  NARROWWEEKDAYS: ['y', 'k', 'p', 't', 'i', 't', 's'],
-  STANDALONENARROWWEEKDAYS: ['y', 'k', 'p', 't', 'i', 't', 's'],
-  SHORTQUARTERS: ['R1', 'R2', 'R3', 'R4'],
-  QUARTERS: ['Robo 1', 'Robo 2', 'Robo 3', 'Robo 4'],
-  AMPMS: ['ya asubuyi', 'ya muchana'],
-  DATEFORMATS: ['EEEE d MMMM y', 'd MMMM y', 'd MMM y', 'd/M/y'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 0,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 6
-};
-
-
-/**
- * Date/time formatting symbols for locale swc_CD.
- */
-goog.i18n.DateTimeSymbols_swc_CD = goog.i18n.DateTimeSymbols_swc;
-
-
 /**
  * Date/time formatting symbols for locale ta_IN.
  */
@@ -18661,57 +18231,6 @@ goog.i18n.DateTimeSymbols_ti_ER = {
 goog.i18n.DateTimeSymbols_ti_ET = goog.i18n.DateTimeSymbols_ti;
 
 
-/**
- * Date/time formatting symbols for locale tn.
- */
-goog.i18n.DateTimeSymbols_tn = {
-  ERAS: ['BCE', 'CE'],
-  ERANAMES: ['BCE', 'CE'],
-  NARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  STANDALONENARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
-    '11', '12'],
-  MONTHS: ['Ferikgong', 'Tlhakole', 'Mopitlo', 'Moranang', 'Motsheganang',
-    'Seetebosigo', 'Phukwi', 'Phatwe', 'Lwetse', 'Diphalane', 'Ngwanatsele',
-    'Sedimonthole'],
-  STANDALONEMONTHS: ['Ferikgong', 'Tlhakole', 'Mopitlo', 'Moranang',
-    'Motsheganang', 'Seetebosigo', 'Phukwi', 'Phatwe', 'Lwetse', 'Diphalane',
-    'Ngwanatsele', 'Sedimonthole'],
-  SHORTMONTHS: ['Fer', 'Tlh', 'Mop', 'Mor', 'Mot', 'See', 'Phu', 'Pha', 'Lwe',
-    'Dip', 'Ngw', 'Sed'],
-  STANDALONESHORTMONTHS: ['Fer', 'Tlh', 'Mop', 'Mor', 'Mot', 'See', 'Phu',
-    'Pha', 'Lwe', 'Dip', 'Ngw', 'Sed'],
-  WEEKDAYS: ['Tshipi', 'Mosopulogo', 'Labobedi', 'Laboraro', 'Labone',
-    'Labotlhano', 'Matlhatso'],
-  STANDALONEWEEKDAYS: ['Tshipi', 'Mosopulogo', 'Labobedi', 'Laboraro', 'Labone',
-    'Labotlhano', 'Matlhatso'],
-  SHORTWEEKDAYS: ['Tsh', 'Mos', 'Bed', 'Rar', 'Ne', 'Tla', 'Mat'],
-  STANDALONESHORTWEEKDAYS: ['Tsh', 'Mos', 'Bed', 'Rar', 'Ne', 'Tla', 'Mat'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  QUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
-  AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['y MMMM d, EEEE', 'y MMMM d', 'y MMM d', 'y-MM-dd'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 6,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
-};
-
-
-/**
- * Date/time formatting symbols for locale tn_BW.
- */
-goog.i18n.DateTimeSymbols_tn_BW = goog.i18n.DateTimeSymbols_tn;
-
-
-/**
- * Date/time formatting symbols for locale tn_ZA.
- */
-goog.i18n.DateTimeSymbols_tn_ZA = goog.i18n.DateTimeSymbols_tn;
-
-
 /**
  * Date/time formatting symbols for locale to.
  */
@@ -18831,52 +18350,6 @@ goog.i18n.DateTimeSymbols_tr_TR = {
 };
 
 
-/**
- * Date/time formatting symbols for locale ts.
- */
-goog.i18n.DateTimeSymbols_ts = {
-  ERAS: ['BCE', 'CE'],
-  ERANAMES: ['BCE', 'CE'],
-  NARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  STANDALONENARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
-    '11', '12'],
-  MONTHS: ['Sunguti', 'Nyenyenyani', 'Nyenyankulu', 'Dzivamisoko', 'Mudyaxihi',
-    'Khotavuxika', 'Mawuwani', 'Mhawuri', 'Ndzhati', 'Nhlangula', 'Hukuri',
-    'N’wendzamhala'],
-  STANDALONEMONTHS: ['Sunguti', 'Nyenyenyani', 'Nyenyankulu', 'Dzivamisoko',
-    'Mudyaxihi', 'Khotavuxika', 'Mawuwani', 'Mhawuri', 'Ndzhati', 'Nhlangula',
-    'Hukuri', 'N’wendzamhala'],
-  SHORTMONTHS: ['Sun', 'Yan', 'Kul', 'Dzi', 'Mud', 'Kho', 'Maw', 'Mha', 'Ndz',
-    'Nhl', 'Huk', 'N’w'],
-  STANDALONESHORTMONTHS: ['Sun', 'Yan', 'Kul', 'Dzi', 'Mud', 'Kho', 'Maw',
-    'Mha', 'Ndz', 'Nhl', 'Huk', 'N’w'],
-  WEEKDAYS: ['Sonto', 'Musumbhunuku', 'Ravumbirhi', 'Ravunharhu', 'Ravumune',
-    'Ravuntlhanu', 'Mugqivela'],
-  STANDALONEWEEKDAYS: ['Sonto', 'Musumbhunuku', 'Ravumbirhi', 'Ravunharhu',
-    'Ravumune', 'Ravuntlhanu', 'Mugqivela'],
-  SHORTWEEKDAYS: ['Son', 'Mus', 'Bir', 'Har', 'Ne', 'Tlh', 'Mug'],
-  STANDALONESHORTWEEKDAYS: ['Son', 'Mus', 'Bir', 'Har', 'Ne', 'Tlh', 'Mug'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
-  QUARTERS: ['Kotara yo sungula', 'Kotara ya vumbirhi', 'Kotara ya vunharhu',
-    'Kotara ya vumune'],
-  AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['y MMMM d, EEEE', 'y MMMM d', 'y MMM d', 'y-MM-dd'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 6,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
-};
-
-
-/**
- * Date/time formatting symbols for locale ts_ZA.
- */
-goog.i18n.DateTimeSymbols_ts_ZA = goog.i18n.DateTimeSymbols_ts;
-
-
 /**
  * Date/time formatting symbols for locale twq.
  */
@@ -19094,17 +18567,18 @@ goog.i18n.DateTimeSymbols_ur_IN = {
   STANDALONESHORTMONTHS: ['جنوری', 'فروری', 'مارچ', 'اپریل',
     'مئی', 'جون', 'جولائی', 'اگست', 'ستمبر',
     'اکتوبر', 'نومبر', 'دسمبر'],
-  WEEKDAYS: ['اتوار', 'پیر', 'منگل', 'بدھ', 'جمعرات',
+  WEEKDAYS: ['اتوار', 'سوموار', 'منگل', 'بدھ', 'جمعرات',
     'جمعہ', 'ہفتہ'],
-  STANDALONEWEEKDAYS: ['اتوار', 'پیر', 'منگل', 'بدھ',
+  STANDALONEWEEKDAYS: ['اتوار', 'سوموار', 'منگل', 'بدھ',
     'جمعرات', 'جمعہ', 'ہفتہ'],
-  SHORTWEEKDAYS: ['اتوار', 'پیر', 'منگل', 'بدھ', 'جمعرات',
-    'جمعہ', 'ہفتہ'],
-  STANDALONESHORTWEEKDAYS: ['اتوار', 'پیر', 'منگل', 'بدھ',
+  SHORTWEEKDAYS: ['اتوار', 'سوموار', 'منگل', 'بدھ',
+    'جمعرات', 'جمعہ', 'ہفتہ'],
+  STANDALONESHORTWEEKDAYS: ['اتوار', 'سوموار', 'منگل', 'بدھ',
     'جمعرات', 'جمعہ', 'ہفتہ'],
   NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
   STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
+  SHORTQUARTERS: ['پہلی سہ ماہی', 'دوسری سہ ماہی',
+    'تیسری سہ ماہی', 'چوتهی سہ ماہی'],
   QUARTERS: ['پہلی سہ ماہی', 'دوسری سہ ماہی',
     'تیسری سہ ماہی', 'چوتهی سہ ماہی'],
   AMPMS: ['قبل دوپہر', 'بعد دوپہر'],
@@ -19401,52 +18875,6 @@ goog.i18n.DateTimeSymbols_vai_Vaii = goog.i18n.DateTimeSymbols_vai;
 goog.i18n.DateTimeSymbols_vai_Vaii_LR = goog.i18n.DateTimeSymbols_vai;
 
 
-/**
- * Date/time formatting symbols for locale ve.
- */
-goog.i18n.DateTimeSymbols_ve = {
-  ERAS: ['BCE', 'CE'],
-  ERANAMES: ['BCE', 'CE'],
-  NARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  STANDALONENARROWMONTHS: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
-    '11', '12'],
-  MONTHS: ['Phando', 'Luhuhi', 'Ṱhafamuhwe', 'Lambamai', 'Shundunthule',
-    'Fulwi', 'Fulwana', 'Ṱhangule', 'Khubvumedzi', 'Tshimedzi', 'Ḽara',
-    'Nyendavhusiku'],
-  STANDALONEMONTHS: ['Phando', 'Luhuhi', 'Ṱhafamuhwe', 'Lambamai',
-    'Shundunthule', 'Fulwi', 'Fulwana', 'Ṱhangule', 'Khubvumedzi',
-    'Tshimedzi', 'Ḽara', 'Nyendavhusiku'],
-  SHORTMONTHS: ['Pha', 'Luh', 'Ṱhf', 'Lam', 'Shu', 'Lwi', 'Lwa', 'Ṱha',
-    'Khu', 'Tsh', 'Ḽar', 'Nye'],
-  STANDALONESHORTMONTHS: ['Pha', 'Luh', 'Ṱhf', 'Lam', 'Shu', 'Lwi', 'Lwa',
-    'Ṱha', 'Khu', 'Tsh', 'Ḽar', 'Nye'],
-  WEEKDAYS: ['Swondaha', 'Musumbuluwo', 'Ḽavhuvhili', 'Ḽavhuraru',
-    'Ḽavhuṋa', 'Ḽavhuṱanu', 'Mugivhela'],
-  STANDALONEWEEKDAYS: ['Swondaha', 'Musumbuluwo', 'Ḽavhuvhili', 'Ḽavhuraru',
-    'Ḽavhuṋa', 'Ḽavhuṱanu', 'Mugivhela'],
-  SHORTWEEKDAYS: ['Swo', 'Mus', 'Vhi', 'Rar', 'Ṋa', 'Ṱan', 'Mug'],
-  STANDALONESHORTWEEKDAYS: ['Swo', 'Mus', 'Vhi', 'Rar', 'Ṋa', 'Ṱan', 'Mug'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
-  SHORTQUARTERS: ['K1', 'K2', 'K3', 'K4'],
-  QUARTERS: ['Kotara ya u thoma', 'Kotara ya vhuvhili', 'Kotara ya vhuraru',
-    'Kotara ya vhuṋa'],
-  AMPMS: ['AM', 'PM'],
-  DATEFORMATS: ['y MMMM d, EEEE', 'y MMMM d', 'y MMM d', 'y-MM-dd'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 6,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 5
-};
-
-
-/**
- * Date/time formatting symbols for locale ve_ZA.
- */
-goog.i18n.DateTimeSymbols_ve_ZA = goog.i18n.DateTimeSymbols_ve;
-
-
 /**
  * Date/time formatting symbols for locale vi_VN.
  */
@@ -19488,49 +18916,6 @@ goog.i18n.DateTimeSymbols_vi_VN = {
 };
 
 
-/**
- * Date/time formatting symbols for locale vo.
- */
-goog.i18n.DateTimeSymbols_vo = {
-  ERAS: ['b. t. kr.', 'p. t. kr.'],
-  ERANAMES: ['b. t. kr.', 'p. t. kr.'],
-  NARROWMONTHS: ['J', 'F', 'M', 'P', 'M', 'Y', 'Y', 'G', 'S', 'T', 'N', 'D'],
-  STANDALONENARROWMONTHS: ['J', 'F', 'M', 'P', 'M', 'Y', 'Y', 'G', 'S', 'T',
-    'N', 'D'],
-  MONTHS: ['janul', 'febul', 'mäzil', 'prilul', 'mayul', 'yunul', 'yulul',
-    'gustul', 'setul', 'tobul', 'novul', 'dekul'],
-  STANDALONEMONTHS: ['janul', 'febul', 'mäzil', 'prilul', 'mayul', 'yunul',
-    'yulul', 'gustul', 'setul', 'tobul', 'novul', 'dekul'],
-  SHORTMONTHS: ['jan', 'feb', 'mäz', 'prl', 'may', 'yun', 'yul', 'gst', 'set',
-    'ton', 'nov', 'dek'],
-  STANDALONESHORTMONTHS: ['jan', 'feb', 'mäz', 'prl', 'may', 'yun', 'yul',
-    'gst', 'set', 'tob', 'nov', 'Dek'],
-  WEEKDAYS: ['sudel', 'mudel', 'tudel', 'vedel', 'dödel', 'fridel', 'zädel'],
-  STANDALONEWEEKDAYS: ['sudel', 'mudel', 'tudel', 'vedel', 'dödel', 'fridel',
-    'zädel'],
-  SHORTWEEKDAYS: ['su.', 'mu.', 'tu.', 've.', 'dö.', 'fr.', 'zä.'],
-  STANDALONESHORTWEEKDAYS: ['Su', 'Mu', 'Tu', 'Ve', 'Dö', 'Fr', 'Zä'],
-  NARROWWEEKDAYS: ['S', 'M', 'T', 'V', 'D', 'F', 'Z'],
-  STANDALONENARROWWEEKDAYS: ['S', 'M', 'T', 'V', 'D', 'F', 'Z'],
-  SHORTQUARTERS: ['Yf1', 'Yf2', 'Yf3', 'Yf4'],
-  QUARTERS: ['1id yelafoldil', '2id yelafoldil', '3id yelafoldil',
-    '4id yelafoldil'],
-  AMPMS: ['posz.', 'büz.'],
-  DATEFORMATS: ['y MMMMa \'d\'. d\'id\'', 'y MMMM d', 'y MMM. d', 'y-MM-dd'],
-  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
-  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
-  FIRSTDAYOFWEEK: 0,
-  WEEKENDRANGE: [5, 6],
-  FIRSTWEEKCUTOFFDAY: 6
-};
-
-
-/**
- * Date/time formatting symbols for locale vo_001.
- */
-goog.i18n.DateTimeSymbols_vo_001 = goog.i18n.DateTimeSymbols_vo;
-
-
 /**
  * Date/time formatting symbols for locale vun.
  */
@@ -19953,7 +19338,7 @@ goog.i18n.DateTimeSymbols_zh_Hans = {
   QUARTERS: ['第一季度', '第二季度', '第三季度', '第四季度'],
   AMPMS: ['上午', '下午'],
   DATEFORMATS: ['y年M月d日EEEE', 'y年M月d日', 'y年M月d日', 'yy/M/d'],
-  TIMEFORMATS: ['zzzzah:mm:ss', 'zah:mm:ss', 'ah:mm:ss', 'ah:mm'],
+  TIMEFORMATS: ['zzzz ah:mm:ss', 'z ah:mm:ss', 'ah:mm:ss', 'ah:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
@@ -19998,8 +19383,8 @@ goog.i18n.DateTimeSymbols_zh_Hans_HK = {
   QUARTERS: ['第一季度', '第二季度', '第三季度', '第四季度'],
   AMPMS: ['上午', '下午'],
   DATEFORMATS: ['y年M月d日EEEE', 'y年M月d日', 'y年M月d日', 'd/M/yy'],
-  TIMEFORMATS: ['zzzzah:mm:ss', 'zah:mm:ss', 'ah:mm:ss', 'ah:mm'],
-  DATETIMEFORMATS: ['{1}{0}', '{1}{0}', '{1} {0}', '{1} {0}'],
+  TIMEFORMATS: ['zzzz ah:mm:ss', 'z ah:mm:ss', 'ah:mm:ss', 'ah:mm'],
+  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
   FIRSTWEEKCUTOFFDAY: 5
@@ -20037,8 +19422,8 @@ goog.i18n.DateTimeSymbols_zh_Hans_MO = {
   QUARTERS: ['第一季度', '第二季度', '第三季度', '第四季度'],
   AMPMS: ['上午', '下午'],
   DATEFORMATS: ['y年M月d日EEEE', 'y年M月d日', 'y年M月d日', 'd/M/yy'],
-  TIMEFORMATS: ['zzzzah:mm:ss', 'zah:mm:ss', 'ah:mm:ss', 'ah:mm'],
-  DATETIMEFORMATS: ['{1}{0}', '{1}{0}', '{1} {0}', '{1} {0}'],
+  TIMEFORMATS: ['zzzz ah:mm:ss', 'z ah:mm:ss', 'ah:mm:ss', 'ah:mm'],
+  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
   FIRSTWEEKCUTOFFDAY: 5
@@ -20076,8 +19461,8 @@ goog.i18n.DateTimeSymbols_zh_Hans_SG = {
   QUARTERS: ['第一季度', '第二季度', '第三季度', '第四季度'],
   AMPMS: ['上午', '下午'],
   DATEFORMATS: ['y年M月d日EEEE', 'y年M月d日', 'y年M月d日', 'dd/MM/yy'],
-  TIMEFORMATS: ['zzzzah:mm:ss', 'ahh:mm:ssz', 'ah:mm:ss', 'ahh:mm'],
-  DATETIMEFORMATS: ['{1}{0}', '{1}{0}', '{1} {0}', '{1} {0}'],
+  TIMEFORMATS: ['zzzz ah:mm:ss', 'z ah:mm:ss', 'ah:mm:ss', 'ah:mm'],
+  DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
   WEEKENDRANGE: [5, 6],
   FIRSTWEEKCUTOFFDAY: 5
@@ -20192,8 +19577,7 @@ goog.i18n.DateTimeSymbols_zh_Hant_MO = {
   SHORTQUARTERS: ['Q1', 'Q2', 'Q3', 'Q4'],
   QUARTERS: ['第1季', '第2季', '第3季', '第4季'],
   AMPMS: ['上午', '下午'],
-  DATEFORMATS: ['y年MM月dd日EEEE', 'y年MM月dd日', 'y年M月d日',
-    'yy年M月d日'],
+  DATEFORMATS: ['y年M月d日EEEE', 'y年M月d日', 'y年M月d日', 'd/M/yy'],
   TIMEFORMATS: ['ah:mm:ss [zzzz]', 'ah:mm:ss [z]', 'ah:mm:ss', 'ah:mm'],
   DATETIMEFORMATS: ['{1} {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
   FIRSTDAYOFWEEK: 6,
@@ -20248,22 +19632,6 @@ goog.i18n.DateTimeSymbols_zu_ZA = {
 /**
  * Selected date/time formatting symbols by locale.
  */
-if (goog.LOCALE == 'aa') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_aa;
-}
-
-if (goog.LOCALE == 'aa_DJ' || goog.LOCALE == 'aa-DJ') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_aa_DJ;
-}
-
-if (goog.LOCALE == 'aa_ER' || goog.LOCALE == 'aa-ER') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_aa;
-}
-
-if (goog.LOCALE == 'aa_ET' || goog.LOCALE == 'aa-ET') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_aa;
-}
-
 if (goog.LOCALE == 'af_NA' || goog.LOCALE == 'af-NA') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_af_NA;
 }
@@ -20452,12 +19820,8 @@ if (goog.LOCALE == 'bas_CM' || goog.LOCALE == 'bas-CM') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bas;
 }
 
-if (goog.LOCALE == 'be') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_be;
-}
-
 if (goog.LOCALE == 'be_BY' || goog.LOCALE == 'be-BY') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_be;
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_be_BY;
 }
 
 if (goog.LOCALE == 'bem') {
@@ -20524,10 +19888,6 @@ if (goog.LOCALE == 'brx_IN' || goog.LOCALE == 'brx-IN') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_brx;
 }
 
-if (goog.LOCALE == 'bs') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bs;
-}
-
 if (goog.LOCALE == 'bs_Cyrl' || goog.LOCALE == 'bs-Cyrl') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bs_Cyrl;
 }
@@ -20537,11 +19897,11 @@ if (goog.LOCALE == 'bs_Cyrl_BA' || goog.LOCALE == 'bs-Cyrl-BA') {
 }
 
 if (goog.LOCALE == 'bs_Latn' || goog.LOCALE == 'bs-Latn') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bs;
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bs_Latn;
 }
 
 if (goog.LOCALE == 'bs_Latn_BA' || goog.LOCALE == 'bs-Latn-BA') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bs;
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bs_Latn;
 }
 
 if (goog.LOCALE == 'ca_AD' || goog.LOCALE == 'ca-AD') {
@@ -20760,10 +20120,6 @@ if (goog.LOCALE == 'en_BZ' || goog.LOCALE == 'en-BZ') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en_BZ;
 }
 
-if (goog.LOCALE == 'en_CA' || goog.LOCALE == 'en-CA') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en_CA;
-}
-
 if (goog.LOCALE == 'en_CC' || goog.LOCALE == 'en-CC') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en_CC;
 }
@@ -21120,10 +20476,6 @@ if (goog.LOCALE == 'es_IC' || goog.LOCALE == 'es-IC') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_IC;
 }
 
-if (goog.LOCALE == 'es_MX' || goog.LOCALE == 'es-MX') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_MX;
-}
-
 if (goog.LOCALE == 'es_NI' || goog.LOCALE == 'es-NI') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_NI;
 }
@@ -21152,10 +20504,6 @@ if (goog.LOCALE == 'es_SV' || goog.LOCALE == 'es-SV') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_SV;
 }
 
-if (goog.LOCALE == 'es_US' || goog.LOCALE == 'es-US') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_US;
-}
-
 if (goog.LOCALE == 'es_UY' || goog.LOCALE == 'es-UY') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_es_UY;
 }
@@ -21524,14 +20872,6 @@ if (goog.LOCALE == 'hy_AM' || goog.LOCALE == 'hy-AM') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_hy_AM;
 }
 
-if (goog.LOCALE == 'ia') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ia;
-}
-
-if (goog.LOCALE == 'ia_FR' || goog.LOCALE == 'ia-FR') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ia;
-}
-
 if (goog.LOCALE == 'id_ID' || goog.LOCALE == 'id-ID') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_id_ID;
 }
@@ -22020,22 +21360,6 @@ if (goog.LOCALE == 'nnh_CM' || goog.LOCALE == 'nnh-CM') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_nnh;
 }
 
-if (goog.LOCALE == 'nr') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_nr;
-}
-
-if (goog.LOCALE == 'nr_ZA' || goog.LOCALE == 'nr-ZA') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_nr;
-}
-
-if (goog.LOCALE == 'nso') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_nso;
-}
-
-if (goog.LOCALE == 'nso_ZA' || goog.LOCALE == 'nso-ZA') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_nso;
-}
-
 if (goog.LOCALE == 'nus') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_nus;
 }
@@ -22388,44 +21712,20 @@ if (goog.LOCALE == 'sr_Cyrl_XK' || goog.LOCALE == 'sr-Cyrl-XK') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Cyrl;
 }
 
-if (goog.LOCALE == 'sr_Latn' || goog.LOCALE == 'sr-Latn') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn;
-}
-
 if (goog.LOCALE == 'sr_Latn_BA' || goog.LOCALE == 'sr-Latn-BA') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn_BA;
 }
 
 if (goog.LOCALE == 'sr_Latn_ME' || goog.LOCALE == 'sr-Latn-ME') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn;
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn_ME;
 }
 
 if (goog.LOCALE == 'sr_Latn_RS' || goog.LOCALE == 'sr-Latn-RS') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn;
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn_RS;
 }
 
 if (goog.LOCALE == 'sr_Latn_XK' || goog.LOCALE == 'sr-Latn-XK') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn;
-}
-
-if (goog.LOCALE == 'ss') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ss;
-}
-
-if (goog.LOCALE == 'ss_SZ' || goog.LOCALE == 'ss-SZ') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ss;
-}
-
-if (goog.LOCALE == 'ss_ZA' || goog.LOCALE == 'ss-ZA') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ss;
-}
-
-if (goog.LOCALE == 'ssy') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ssy;
-}
-
-if (goog.LOCALE == 'ssy_ER' || goog.LOCALE == 'ssy-ER') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ssy;
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sr_Latn_XK;
 }
 
 if (goog.LOCALE == 'sv_AX' || goog.LOCALE == 'sv-AX') {
@@ -22440,6 +21740,10 @@ if (goog.LOCALE == 'sv_SE' || goog.LOCALE == 'sv-SE') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sv_SE;
 }
 
+if (goog.LOCALE == 'sw_CD' || goog.LOCALE == 'sw-CD') {
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sw_CD;
+}
+
 if (goog.LOCALE == 'sw_KE' || goog.LOCALE == 'sw-KE') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sw_KE;
 }
@@ -22452,14 +21756,6 @@ if (goog.LOCALE == 'sw_UG' || goog.LOCALE == 'sw-UG') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_sw_UG;
 }
 
-if (goog.LOCALE == 'swc') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_swc;
-}
-
-if (goog.LOCALE == 'swc_CD' || goog.LOCALE == 'swc-CD') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_swc;
-}
-
 if (goog.LOCALE == 'ta_IN' || goog.LOCALE == 'ta-IN') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ta_IN;
 }
@@ -22508,18 +21804,6 @@ if (goog.LOCALE == 'ti_ET' || goog.LOCALE == 'ti-ET') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ti;
 }
 
-if (goog.LOCALE == 'tn') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_tn;
-}
-
-if (goog.LOCALE == 'tn_BW' || goog.LOCALE == 'tn-BW') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_tn;
-}
-
-if (goog.LOCALE == 'tn_ZA' || goog.LOCALE == 'tn-ZA') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_tn;
-}
-
 if (goog.LOCALE == 'to') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_to;
 }
@@ -22536,14 +21820,6 @@ if (goog.LOCALE == 'tr_TR' || goog.LOCALE == 'tr-TR') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_tr_TR;
 }
 
-if (goog.LOCALE == 'ts') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ts;
-}
-
-if (goog.LOCALE == 'ts_ZA' || goog.LOCALE == 'ts-ZA') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ts;
-}
-
 if (goog.LOCALE == 'twq') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_twq;
 }
@@ -22632,26 +21908,10 @@ if (goog.LOCALE == 'vai_Vaii_LR' || goog.LOCALE == 'vai-Vaii-LR') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_vai;
 }
 
-if (goog.LOCALE == 've') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ve;
-}
-
-if (goog.LOCALE == 've_ZA' || goog.LOCALE == 've-ZA') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_ve;
-}
-
 if (goog.LOCALE == 'vi_VN' || goog.LOCALE == 'vi-VN') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_vi_VN;
 }
 
-if (goog.LOCALE == 'vo') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_vo;
-}
-
-if (goog.LOCALE == 'vo_001' || goog.LOCALE == 'vo-001') {
-  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_vo;
-}
-
 if (goog.LOCALE == 'vun') {
   goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_vun;
 }
diff --git a/i18n/closure/numberSymbols.js b/i18n/closure/numberSymbols.js
index 3f4296497e41..664b4fb61905 100644
--- a/i18n/closure/numberSymbols.js
+++ b/i18n/closure/numberSymbols.js
@@ -18,7 +18,7 @@
  * This file is autogenerated by script:
  * http://go/generate_number_constants.py
  * using the --for_closure flag.
- * File generated from CLDR ver. 26
+ * File generated from CLDR ver. 27.0.1
  *
  * To reduce the file size (which may cause issues in some JS
  * developing environments), this file will only contain locales
@@ -41,14 +41,21 @@ goog.provide('goog.i18n.NumberFormatSymbols_am');
 goog.provide('goog.i18n.NumberFormatSymbols_am_ET');
 goog.provide('goog.i18n.NumberFormatSymbols_ar');
 goog.provide('goog.i18n.NumberFormatSymbols_ar_001');
+goog.provide('goog.i18n.NumberFormatSymbols_ar_EG');
 goog.provide('goog.i18n.NumberFormatSymbols_az');
+goog.provide('goog.i18n.NumberFormatSymbols_az_Latn');
 goog.provide('goog.i18n.NumberFormatSymbols_az_Latn_AZ');
+goog.provide('goog.i18n.NumberFormatSymbols_be');
+goog.provide('goog.i18n.NumberFormatSymbols_be_BY');
 goog.provide('goog.i18n.NumberFormatSymbols_bg');
 goog.provide('goog.i18n.NumberFormatSymbols_bg_BG');
 goog.provide('goog.i18n.NumberFormatSymbols_bn');
 goog.provide('goog.i18n.NumberFormatSymbols_bn_BD');
 goog.provide('goog.i18n.NumberFormatSymbols_br');
 goog.provide('goog.i18n.NumberFormatSymbols_br_FR');
+goog.provide('goog.i18n.NumberFormatSymbols_bs');
+goog.provide('goog.i18n.NumberFormatSymbols_bs_Latn');
+goog.provide('goog.i18n.NumberFormatSymbols_bs_Latn_BA');
 goog.provide('goog.i18n.NumberFormatSymbols_ca');
 goog.provide('goog.i18n.NumberFormatSymbols_ca_AD');
 goog.provide('goog.i18n.NumberFormatSymbols_ca_ES');
@@ -71,11 +78,13 @@ goog.provide('goog.i18n.NumberFormatSymbols_de_CH');
 goog.provide('goog.i18n.NumberFormatSymbols_de_DE');
 goog.provide('goog.i18n.NumberFormatSymbols_de_LU');
 goog.provide('goog.i18n.NumberFormatSymbols_el');
+goog.provide('goog.i18n.NumberFormatSymbols_el_CY');
 goog.provide('goog.i18n.NumberFormatSymbols_el_GR');
 goog.provide('goog.i18n.NumberFormatSymbols_en');
 goog.provide('goog.i18n.NumberFormatSymbols_en_001');
 goog.provide('goog.i18n.NumberFormatSymbols_en_AS');
 goog.provide('goog.i18n.NumberFormatSymbols_en_AU');
+goog.provide('goog.i18n.NumberFormatSymbols_en_CA');
 goog.provide('goog.i18n.NumberFormatSymbols_en_DG');
 goog.provide('goog.i18n.NumberFormatSymbols_en_FM');
 goog.provide('goog.i18n.NumberFormatSymbols_en_GB');
@@ -100,6 +109,8 @@ goog.provide('goog.i18n.NumberFormatSymbols_es_419');
 goog.provide('goog.i18n.NumberFormatSymbols_es_EA');
 goog.provide('goog.i18n.NumberFormatSymbols_es_ES');
 goog.provide('goog.i18n.NumberFormatSymbols_es_IC');
+goog.provide('goog.i18n.NumberFormatSymbols_es_MX');
+goog.provide('goog.i18n.NumberFormatSymbols_es_US');
 goog.provide('goog.i18n.NumberFormatSymbols_et');
 goog.provide('goog.i18n.NumberFormatSymbols_et_EE');
 goog.provide('goog.i18n.NumberFormatSymbols_eu');
@@ -157,6 +168,7 @@ goog.provide('goog.i18n.NumberFormatSymbols_ja_JP');
 goog.provide('goog.i18n.NumberFormatSymbols_ka');
 goog.provide('goog.i18n.NumberFormatSymbols_ka_GE');
 goog.provide('goog.i18n.NumberFormatSymbols_kk');
+goog.provide('goog.i18n.NumberFormatSymbols_kk_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_kk_Cyrl_KZ');
 goog.provide('goog.i18n.NumberFormatSymbols_km');
 goog.provide('goog.i18n.NumberFormatSymbols_km_KH');
@@ -165,6 +177,7 @@ goog.provide('goog.i18n.NumberFormatSymbols_kn_IN');
 goog.provide('goog.i18n.NumberFormatSymbols_ko');
 goog.provide('goog.i18n.NumberFormatSymbols_ko_KR');
 goog.provide('goog.i18n.NumberFormatSymbols_ky');
+goog.provide('goog.i18n.NumberFormatSymbols_ky_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_ky_Cyrl_KG');
 goog.provide('goog.i18n.NumberFormatSymbols_ln');
 goog.provide('goog.i18n.NumberFormatSymbols_ln_CD');
@@ -179,10 +192,12 @@ goog.provide('goog.i18n.NumberFormatSymbols_mk_MK');
 goog.provide('goog.i18n.NumberFormatSymbols_ml');
 goog.provide('goog.i18n.NumberFormatSymbols_ml_IN');
 goog.provide('goog.i18n.NumberFormatSymbols_mn');
+goog.provide('goog.i18n.NumberFormatSymbols_mn_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_mn_Cyrl_MN');
 goog.provide('goog.i18n.NumberFormatSymbols_mr');
 goog.provide('goog.i18n.NumberFormatSymbols_mr_IN');
 goog.provide('goog.i18n.NumberFormatSymbols_ms');
+goog.provide('goog.i18n.NumberFormatSymbols_ms_Latn');
 goog.provide('goog.i18n.NumberFormatSymbols_ms_Latn_MY');
 goog.provide('goog.i18n.NumberFormatSymbols_mt');
 goog.provide('goog.i18n.NumberFormatSymbols_mt_MT');
@@ -200,6 +215,7 @@ goog.provide('goog.i18n.NumberFormatSymbols_no_NO');
 goog.provide('goog.i18n.NumberFormatSymbols_or');
 goog.provide('goog.i18n.NumberFormatSymbols_or_IN');
 goog.provide('goog.i18n.NumberFormatSymbols_pa');
+goog.provide('goog.i18n.NumberFormatSymbols_pa_Guru');
 goog.provide('goog.i18n.NumberFormatSymbols_pa_Guru_IN');
 goog.provide('goog.i18n.NumberFormatSymbols_pl');
 goog.provide('goog.i18n.NumberFormatSymbols_pl_PL');
@@ -219,7 +235,10 @@ goog.provide('goog.i18n.NumberFormatSymbols_sl_SI');
 goog.provide('goog.i18n.NumberFormatSymbols_sq');
 goog.provide('goog.i18n.NumberFormatSymbols_sq_AL');
 goog.provide('goog.i18n.NumberFormatSymbols_sr');
+goog.provide('goog.i18n.NumberFormatSymbols_sr_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_sr_Cyrl_RS');
+goog.provide('goog.i18n.NumberFormatSymbols_sr_Latn');
+goog.provide('goog.i18n.NumberFormatSymbols_sr_Latn_RS');
 goog.provide('goog.i18n.NumberFormatSymbols_sv');
 goog.provide('goog.i18n.NumberFormatSymbols_sv_SE');
 goog.provide('goog.i18n.NumberFormatSymbols_sw');
@@ -238,12 +257,14 @@ goog.provide('goog.i18n.NumberFormatSymbols_uk_UA');
 goog.provide('goog.i18n.NumberFormatSymbols_ur');
 goog.provide('goog.i18n.NumberFormatSymbols_ur_PK');
 goog.provide('goog.i18n.NumberFormatSymbols_uz');
+goog.provide('goog.i18n.NumberFormatSymbols_uz_Latn');
 goog.provide('goog.i18n.NumberFormatSymbols_uz_Latn_UZ');
 goog.provide('goog.i18n.NumberFormatSymbols_vi');
 goog.provide('goog.i18n.NumberFormatSymbols_vi_VN');
 goog.provide('goog.i18n.NumberFormatSymbols_zh');
 goog.provide('goog.i18n.NumberFormatSymbols_zh_CN');
 goog.provide('goog.i18n.NumberFormatSymbols_zh_HK');
+goog.provide('goog.i18n.NumberFormatSymbols_zh_Hans');
 goog.provide('goog.i18n.NumberFormatSymbols_zh_Hans_CN');
 goog.provide('goog.i18n.NumberFormatSymbols_zh_TW');
 goog.provide('goog.i18n.NumberFormatSymbols_zu');
@@ -340,6 +361,13 @@ goog.i18n.NumberFormatSymbols_ar = {
 goog.i18n.NumberFormatSymbols_ar_001 = goog.i18n.NumberFormatSymbols_ar;
 
 
+/**
+ * Number formatting symbols for locale ar_EG.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_ar_EG = goog.i18n.NumberFormatSymbols_ar;
+
+
 /**
  * Number formatting symbols for locale az.
  * @enum {string}
@@ -363,6 +391,13 @@ goog.i18n.NumberFormatSymbols_az = {
 };
 
 
+/**
+ * Number formatting symbols for locale az_Latn.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_az_Latn = goog.i18n.NumberFormatSymbols_az;
+
+
 /**
  * Number formatting symbols for locale az_Latn_AZ.
  * @enum {string}
@@ -370,6 +405,36 @@ goog.i18n.NumberFormatSymbols_az = {
 goog.i18n.NumberFormatSymbols_az_Latn_AZ = goog.i18n.NumberFormatSymbols_az;
 
 
+/**
+ * Number formatting symbols for locale be.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_be = {
+  DECIMAL_SEP: ',',
+  GROUP_SEP: '\u00A0',
+  PERCENT: '%',
+  ZERO_DIGIT: '0',
+  PLUS_SIGN: '+',
+  MINUS_SIGN: '-',
+  EXP_SYMBOL: 'E',
+  PERMILL: '\u2030',
+  INFINITY: '\u221E',
+  NAN: 'NaN',
+  DECIMAL_PATTERN: '#,##0.###',
+  SCIENTIFIC_PATTERN: '#E0',
+  PERCENT_PATTERN: '#,##0%',
+  CURRENCY_PATTERN: '\u00A4#,##0.00',
+  DEF_CURRENCY_CODE: 'BYR'
+};
+
+
+/**
+ * Number formatting symbols for locale be_BY.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_be_BY = goog.i18n.NumberFormatSymbols_be;
+
+
 /**
  * Number formatting symbols for locale bg.
  * @enum {string}
@@ -460,6 +525,43 @@ goog.i18n.NumberFormatSymbols_br = {
 goog.i18n.NumberFormatSymbols_br_FR = goog.i18n.NumberFormatSymbols_br;
 
 
+/**
+ * Number formatting symbols for locale bs.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_bs = {
+  DECIMAL_SEP: ',',
+  GROUP_SEP: '.',
+  PERCENT: '%',
+  ZERO_DIGIT: '0',
+  PLUS_SIGN: '+',
+  MINUS_SIGN: '-',
+  EXP_SYMBOL: 'E',
+  PERMILL: '\u2030',
+  INFINITY: '\u221E',
+  NAN: 'NaN',
+  DECIMAL_PATTERN: '#,##0.###',
+  SCIENTIFIC_PATTERN: '#E0',
+  PERCENT_PATTERN: '#,##0%',
+  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
+  DEF_CURRENCY_CODE: 'BAM'
+};
+
+
+/**
+ * Number formatting symbols for locale bs_Latn.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_bs_Latn = goog.i18n.NumberFormatSymbols_bs;
+
+
+/**
+ * Number formatting symbols for locale bs_Latn_BA.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_bs_Latn_BA = goog.i18n.NumberFormatSymbols_bs;
+
+
 /**
  * Number formatting symbols for locale ca.
  * @enum {string}
@@ -758,6 +860,13 @@ goog.i18n.NumberFormatSymbols_el = {
 };
 
 
+/**
+ * Number formatting symbols for locale el_CY.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_el_CY = goog.i18n.NumberFormatSymbols_el;
+
+
 /**
  * Number formatting symbols for locale el_GR.
  * @enum {string}
@@ -825,6 +934,29 @@ goog.i18n.NumberFormatSymbols_en_AU = {
 };
 
 
+/**
+ * Number formatting symbols for locale en_CA.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_en_CA = {
+  DECIMAL_SEP: '.',
+  GROUP_SEP: ',',
+  PERCENT: '%',
+  ZERO_DIGIT: '0',
+  PLUS_SIGN: '+',
+  MINUS_SIGN: '-',
+  EXP_SYMBOL: 'E',
+  PERMILL: '\u2030',
+  INFINITY: '\u221E',
+  NAN: 'NaN',
+  DECIMAL_PATTERN: '#,##0.###',
+  SCIENTIFIC_PATTERN: '#E0',
+  PERCENT_PATTERN: '#,##0%',
+  CURRENCY_PATTERN: '\u00A4#,##0.00',
+  DEF_CURRENCY_CODE: 'CAD'
+};
+
+
 /**
  * Number formatting symbols for locale en_DG.
  * @enum {string}
@@ -1105,6 +1237,52 @@ goog.i18n.NumberFormatSymbols_es_ES = goog.i18n.NumberFormatSymbols_es;
 goog.i18n.NumberFormatSymbols_es_IC = goog.i18n.NumberFormatSymbols_es;
 
 
+/**
+ * Number formatting symbols for locale es_MX.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_es_MX = {
+  DECIMAL_SEP: '.',
+  GROUP_SEP: ',',
+  PERCENT: '%',
+  ZERO_DIGIT: '0',
+  PLUS_SIGN: '+',
+  MINUS_SIGN: '-',
+  EXP_SYMBOL: 'E',
+  PERMILL: '\u2030',
+  INFINITY: '\u221E',
+  NAN: 'NaN',
+  DECIMAL_PATTERN: '#,##0.###',
+  SCIENTIFIC_PATTERN: '#E0',
+  PERCENT_PATTERN: '#,##0%',
+  CURRENCY_PATTERN: '\u00A4#,##0.00',
+  DEF_CURRENCY_CODE: 'MXN'
+};
+
+
+/**
+ * Number formatting symbols for locale es_US.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_es_US = {
+  DECIMAL_SEP: '.',
+  GROUP_SEP: ',',
+  PERCENT: '%',
+  ZERO_DIGIT: '0',
+  PLUS_SIGN: '+',
+  MINUS_SIGN: '-',
+  EXP_SYMBOL: 'E',
+  PERMILL: '\u2030',
+  INFINITY: '\u221E',
+  NAN: 'NaN',
+  DECIMAL_PATTERN: '#,##0.###',
+  SCIENTIFIC_PATTERN: '#E0',
+  PERCENT_PATTERN: '#,##0\u00A0%',
+  CURRENCY_PATTERN: '\u00A4#,##0.00',
+  DEF_CURRENCY_CODE: 'USD'
+};
+
+
 /**
  * Number formatting symbols for locale et.
  * @enum {string}
@@ -1905,6 +2083,13 @@ goog.i18n.NumberFormatSymbols_kk = {
 };
 
 
+/**
+ * Number formatting symbols for locale kk_Cyrl.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_kk_Cyrl = goog.i18n.NumberFormatSymbols_kk;
+
+
 /**
  * Number formatting symbols for locale kk_Cyrl_KZ.
  * @enum {string}
@@ -2025,6 +2210,13 @@ goog.i18n.NumberFormatSymbols_ky = {
 };
 
 
+/**
+ * Number formatting symbols for locale ky_Cyrl.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_ky_Cyrl = goog.i18n.NumberFormatSymbols_ky;
+
+
 /**
  * Number formatting symbols for locale ky_Cyrl_KG.
  * @enum {string}
@@ -2236,6 +2428,13 @@ goog.i18n.NumberFormatSymbols_mn = {
 };
 
 
+/**
+ * Number formatting symbols for locale mn_Cyrl.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_mn_Cyrl = goog.i18n.NumberFormatSymbols_mn;
+
+
 /**
  * Number formatting symbols for locale mn_Cyrl_MN.
  * @enum {string}
@@ -2296,6 +2495,13 @@ goog.i18n.NumberFormatSymbols_ms = {
 };
 
 
+/**
+ * Number formatting symbols for locale ms_Latn.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_ms_Latn = goog.i18n.NumberFormatSymbols_ms;
+
+
 /**
  * Number formatting symbols for locale ms_Latn_MY.
  * @enum {string}
@@ -2449,7 +2655,7 @@ goog.i18n.NumberFormatSymbols_nl = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0#,##0.00-',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0-#,##0.00',
   DEF_CURRENCY_CODE: 'EUR'
 };
 
@@ -2544,6 +2750,13 @@ goog.i18n.NumberFormatSymbols_pa = {
 };
 
 
+/**
+ * Number formatting symbols for locale pa_Guru.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_pa_Guru = goog.i18n.NumberFormatSymbols_pa;
+
+
 /**
  * Number formatting symbols for locale pa_Guru_IN.
  * @enum {string}
@@ -2837,6 +3050,13 @@ goog.i18n.NumberFormatSymbols_sr = {
 };
 
 
+/**
+ * Number formatting symbols for locale sr_Cyrl.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_sr_Cyrl = goog.i18n.NumberFormatSymbols_sr;
+
+
 /**
  * Number formatting symbols for locale sr_Cyrl_RS.
  * @enum {string}
@@ -2844,6 +3064,37 @@ goog.i18n.NumberFormatSymbols_sr = {
 goog.i18n.NumberFormatSymbols_sr_Cyrl_RS = goog.i18n.NumberFormatSymbols_sr;
 
 
+/**
+ * Number formatting symbols for locale sr_Latn.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_sr_Latn = {
+  DECIMAL_SEP: ',',
+  GROUP_SEP: '.',
+  PERCENT: '%',
+  ZERO_DIGIT: '0',
+  PLUS_SIGN: '+',
+  MINUS_SIGN: '-',
+  EXP_SYMBOL: 'E',
+  PERMILL: '\u2030',
+  INFINITY: '\u221E',
+  NAN: 'NaN',
+  DECIMAL_PATTERN: '#,##0.###',
+  SCIENTIFIC_PATTERN: '#E0',
+  PERCENT_PATTERN: '#,##0%',
+  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
+  DEF_CURRENCY_CODE: 'RSD'
+};
+
+
+/**
+ * Number formatting symbols for locale sr_Latn_RS.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_sr_Latn_RS =
+    goog.i18n.NumberFormatSymbols_sr_Latn;
+
+
 /**
  * Number formatting symbols for locale sv.
  * @enum {string}
@@ -3130,6 +3381,13 @@ goog.i18n.NumberFormatSymbols_uz = {
 };
 
 
+/**
+ * Number formatting symbols for locale uz_Latn.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_uz_Latn = goog.i18n.NumberFormatSymbols_uz;
+
+
 /**
  * Number formatting symbols for locale uz_Latn_UZ.
  * @enum {string}
@@ -3220,6 +3478,13 @@ goog.i18n.NumberFormatSymbols_zh_HK = {
 };
 
 
+/**
+ * Number formatting symbols for locale zh_Hans.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_zh_Hans = goog.i18n.NumberFormatSymbols_zh;
+
+
 /**
  * Number formatting symbols for locale zh_Hans_CN.
  * @enum {string}
@@ -3309,14 +3574,30 @@ if (goog.LOCALE == 'ar_001' || goog.LOCALE == 'ar-001') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ar;
 }
 
+if (goog.LOCALE == 'ar_EG' || goog.LOCALE == 'ar-EG') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ar;
+}
+
 if (goog.LOCALE == 'az') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_az;
 }
 
+if (goog.LOCALE == 'az_Latn' || goog.LOCALE == 'az-Latn') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_az;
+}
+
 if (goog.LOCALE == 'az_Latn_AZ' || goog.LOCALE == 'az-Latn-AZ') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_az;
 }
 
+if (goog.LOCALE == 'be') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_be;
+}
+
+if (goog.LOCALE == 'be_BY' || goog.LOCALE == 'be-BY') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_be;
+}
+
 if (goog.LOCALE == 'bg') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bg;
 }
@@ -3341,6 +3622,18 @@ if (goog.LOCALE == 'br_FR' || goog.LOCALE == 'br-FR') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_br;
 }
 
+if (goog.LOCALE == 'bs') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs;
+}
+
+if (goog.LOCALE == 'bs_Latn' || goog.LOCALE == 'bs-Latn') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs;
+}
+
+if (goog.LOCALE == 'bs_Latn_BA' || goog.LOCALE == 'bs-Latn-BA') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs;
+}
+
 if (goog.LOCALE == 'ca') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ca;
 }
@@ -3429,6 +3722,10 @@ if (goog.LOCALE == 'el') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_el;
 }
 
+if (goog.LOCALE == 'el_CY' || goog.LOCALE == 'el-CY') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_el;
+}
+
 if (goog.LOCALE == 'el_GR' || goog.LOCALE == 'el-GR') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_el;
 }
@@ -3449,6 +3746,10 @@ if (goog.LOCALE == 'en_AU' || goog.LOCALE == 'en-AU') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_en_AU;
 }
 
+if (goog.LOCALE == 'en_CA' || goog.LOCALE == 'en-CA') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_en_CA;
+}
+
 if (goog.LOCALE == 'en_DG' || goog.LOCALE == 'en-DG') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_en;
 }
@@ -3545,6 +3846,14 @@ if (goog.LOCALE == 'es_IC' || goog.LOCALE == 'es-IC') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es;
 }
 
+if (goog.LOCALE == 'es_MX' || goog.LOCALE == 'es-MX') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es_MX;
+}
+
+if (goog.LOCALE == 'es_US' || goog.LOCALE == 'es-US') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es_US;
+}
+
 if (goog.LOCALE == 'et') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_et;
 }
@@ -3773,6 +4082,10 @@ if (goog.LOCALE == 'kk') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_kk;
 }
 
+if (goog.LOCALE == 'kk_Cyrl' || goog.LOCALE == 'kk-Cyrl') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_kk;
+}
+
 if (goog.LOCALE == 'kk_Cyrl_KZ' || goog.LOCALE == 'kk-Cyrl-KZ') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_kk;
 }
@@ -3805,6 +4118,10 @@ if (goog.LOCALE == 'ky') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ky;
 }
 
+if (goog.LOCALE == 'ky_Cyrl' || goog.LOCALE == 'ky-Cyrl') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ky;
+}
+
 if (goog.LOCALE == 'ky_Cyrl_KG' || goog.LOCALE == 'ky-Cyrl-KG') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ky;
 }
@@ -3861,6 +4178,10 @@ if (goog.LOCALE == 'mn') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_mn;
 }
 
+if (goog.LOCALE == 'mn_Cyrl' || goog.LOCALE == 'mn-Cyrl') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_mn;
+}
+
 if (goog.LOCALE == 'mn_Cyrl_MN' || goog.LOCALE == 'mn-Cyrl-MN') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_mn;
 }
@@ -3877,6 +4198,10 @@ if (goog.LOCALE == 'ms') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ms;
 }
 
+if (goog.LOCALE == 'ms_Latn' || goog.LOCALE == 'ms-Latn') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ms;
+}
+
 if (goog.LOCALE == 'ms_Latn_MY' || goog.LOCALE == 'ms-Latn-MY') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ms;
 }
@@ -3945,6 +4270,10 @@ if (goog.LOCALE == 'pa') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_pa;
 }
 
+if (goog.LOCALE == 'pa_Guru' || goog.LOCALE == 'pa-Guru') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_pa;
+}
+
 if (goog.LOCALE == 'pa_Guru_IN' || goog.LOCALE == 'pa-Guru-IN') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_pa;
 }
@@ -4021,10 +4350,22 @@ if (goog.LOCALE == 'sr') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr;
 }
 
+if (goog.LOCALE == 'sr_Cyrl' || goog.LOCALE == 'sr-Cyrl') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr;
+}
+
 if (goog.LOCALE == 'sr_Cyrl_RS' || goog.LOCALE == 'sr-Cyrl-RS') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr;
 }
 
+if (goog.LOCALE == 'sr_Latn' || goog.LOCALE == 'sr-Latn') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Latn;
+}
+
+if (goog.LOCALE == 'sr_Latn_RS' || goog.LOCALE == 'sr-Latn-RS') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Latn;
+}
+
 if (goog.LOCALE == 'sv') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sv;
 }
@@ -4097,6 +4438,10 @@ if (goog.LOCALE == 'uz') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_uz;
 }
 
+if (goog.LOCALE == 'uz_Latn' || goog.LOCALE == 'uz-Latn') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_uz;
+}
+
 if (goog.LOCALE == 'uz_Latn_UZ' || goog.LOCALE == 'uz-Latn-UZ') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_uz;
 }
@@ -4121,6 +4466,10 @@ if (goog.LOCALE == 'zh_HK' || goog.LOCALE == 'zh-HK') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_zh_HK;
 }
 
+if (goog.LOCALE == 'zh_Hans' || goog.LOCALE == 'zh-Hans') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_zh;
+}
+
 if (goog.LOCALE == 'zh_Hans_CN' || goog.LOCALE == 'zh-Hans-CN') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_zh;
 }
diff --git a/i18n/closure/numberSymbolsExt.js b/i18n/closure/numberSymbolsExt.js
index e9c011196ca4..deb71cc93e57 100644
--- a/i18n/closure/numberSymbolsExt.js
+++ b/i18n/closure/numberSymbolsExt.js
@@ -18,7 +18,7 @@
  * This file is autogenerated by script:
  * http://go/generate_number_constants.py
  * using the --for_closure flag.
- * File generated from CLDR ver. 26
+ * File generated from CLDR ver. 27.0.1
  *
  * This file coveres those locales that are not covered in
  * "numberformatsymbols.js".
@@ -30,10 +30,6 @@
  */
 
 goog.provide('goog.i18n.NumberFormatSymbolsExt');
-goog.provide('goog.i18n.NumberFormatSymbols_aa');
-goog.provide('goog.i18n.NumberFormatSymbols_aa_DJ');
-goog.provide('goog.i18n.NumberFormatSymbols_aa_ER');
-goog.provide('goog.i18n.NumberFormatSymbols_aa_ET');
 goog.provide('goog.i18n.NumberFormatSymbols_af_NA');
 goog.provide('goog.i18n.NumberFormatSymbols_agq');
 goog.provide('goog.i18n.NumberFormatSymbols_agq_CM');
@@ -43,7 +39,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_ar_AE');
 goog.provide('goog.i18n.NumberFormatSymbols_ar_BH');
 goog.provide('goog.i18n.NumberFormatSymbols_ar_DJ');
 goog.provide('goog.i18n.NumberFormatSymbols_ar_DZ');
-goog.provide('goog.i18n.NumberFormatSymbols_ar_EG');
 goog.provide('goog.i18n.NumberFormatSymbols_ar_EH');
 goog.provide('goog.i18n.NumberFormatSymbols_ar_ER');
 goog.provide('goog.i18n.NumberFormatSymbols_ar_IL');
@@ -74,11 +69,8 @@ goog.provide('goog.i18n.NumberFormatSymbols_ast');
 goog.provide('goog.i18n.NumberFormatSymbols_ast_ES');
 goog.provide('goog.i18n.NumberFormatSymbols_az_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_az_Cyrl_AZ');
-goog.provide('goog.i18n.NumberFormatSymbols_az_Latn');
 goog.provide('goog.i18n.NumberFormatSymbols_bas');
 goog.provide('goog.i18n.NumberFormatSymbols_bas_CM');
-goog.provide('goog.i18n.NumberFormatSymbols_be');
-goog.provide('goog.i18n.NumberFormatSymbols_be_BY');
 goog.provide('goog.i18n.NumberFormatSymbols_bem');
 goog.provide('goog.i18n.NumberFormatSymbols_bem_ZM');
 goog.provide('goog.i18n.NumberFormatSymbols_bez');
@@ -92,11 +84,8 @@ goog.provide('goog.i18n.NumberFormatSymbols_bo_CN');
 goog.provide('goog.i18n.NumberFormatSymbols_bo_IN');
 goog.provide('goog.i18n.NumberFormatSymbols_brx');
 goog.provide('goog.i18n.NumberFormatSymbols_brx_IN');
-goog.provide('goog.i18n.NumberFormatSymbols_bs');
 goog.provide('goog.i18n.NumberFormatSymbols_bs_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_bs_Cyrl_BA');
-goog.provide('goog.i18n.NumberFormatSymbols_bs_Latn');
-goog.provide('goog.i18n.NumberFormatSymbols_bs_Latn_BA');
 goog.provide('goog.i18n.NumberFormatSymbols_cgg');
 goog.provide('goog.i18n.NumberFormatSymbols_cgg_UG');
 goog.provide('goog.i18n.NumberFormatSymbols_ckb');
@@ -125,7 +114,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_ebu_KE');
 goog.provide('goog.i18n.NumberFormatSymbols_ee');
 goog.provide('goog.i18n.NumberFormatSymbols_ee_GH');
 goog.provide('goog.i18n.NumberFormatSymbols_ee_TG');
-goog.provide('goog.i18n.NumberFormatSymbols_el_CY');
 goog.provide('goog.i18n.NumberFormatSymbols_en_150');
 goog.provide('goog.i18n.NumberFormatSymbols_en_AG');
 goog.provide('goog.i18n.NumberFormatSymbols_en_AI');
@@ -135,7 +123,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_en_BM');
 goog.provide('goog.i18n.NumberFormatSymbols_en_BS');
 goog.provide('goog.i18n.NumberFormatSymbols_en_BW');
 goog.provide('goog.i18n.NumberFormatSymbols_en_BZ');
-goog.provide('goog.i18n.NumberFormatSymbols_en_CA');
 goog.provide('goog.i18n.NumberFormatSymbols_en_CC');
 goog.provide('goog.i18n.NumberFormatSymbols_en_CK');
 goog.provide('goog.i18n.NumberFormatSymbols_en_CM');
@@ -210,7 +197,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_es_EC');
 goog.provide('goog.i18n.NumberFormatSymbols_es_GQ');
 goog.provide('goog.i18n.NumberFormatSymbols_es_GT');
 goog.provide('goog.i18n.NumberFormatSymbols_es_HN');
-goog.provide('goog.i18n.NumberFormatSymbols_es_MX');
 goog.provide('goog.i18n.NumberFormatSymbols_es_NI');
 goog.provide('goog.i18n.NumberFormatSymbols_es_PA');
 goog.provide('goog.i18n.NumberFormatSymbols_es_PE');
@@ -218,7 +204,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_es_PH');
 goog.provide('goog.i18n.NumberFormatSymbols_es_PR');
 goog.provide('goog.i18n.NumberFormatSymbols_es_PY');
 goog.provide('goog.i18n.NumberFormatSymbols_es_SV');
-goog.provide('goog.i18n.NumberFormatSymbols_es_US');
 goog.provide('goog.i18n.NumberFormatSymbols_es_UY');
 goog.provide('goog.i18n.NumberFormatSymbols_es_VE');
 goog.provide('goog.i18n.NumberFormatSymbols_ewo');
@@ -285,8 +270,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_ha_Latn_NG');
 goog.provide('goog.i18n.NumberFormatSymbols_hr_BA');
 goog.provide('goog.i18n.NumberFormatSymbols_hsb');
 goog.provide('goog.i18n.NumberFormatSymbols_hsb_DE');
-goog.provide('goog.i18n.NumberFormatSymbols_ia');
-goog.provide('goog.i18n.NumberFormatSymbols_ia_FR');
 goog.provide('goog.i18n.NumberFormatSymbols_ig');
 goog.provide('goog.i18n.NumberFormatSymbols_ig_NG');
 goog.provide('goog.i18n.NumberFormatSymbols_ii');
@@ -308,7 +291,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_khq');
 goog.provide('goog.i18n.NumberFormatSymbols_khq_ML');
 goog.provide('goog.i18n.NumberFormatSymbols_ki');
 goog.provide('goog.i18n.NumberFormatSymbols_ki_KE');
-goog.provide('goog.i18n.NumberFormatSymbols_kk_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_kkj');
 goog.provide('goog.i18n.NumberFormatSymbols_kkj_CM');
 goog.provide('goog.i18n.NumberFormatSymbols_kl');
@@ -329,7 +311,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_ksh');
 goog.provide('goog.i18n.NumberFormatSymbols_ksh_DE');
 goog.provide('goog.i18n.NumberFormatSymbols_kw');
 goog.provide('goog.i18n.NumberFormatSymbols_kw_GB');
-goog.provide('goog.i18n.NumberFormatSymbols_ky_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_lag');
 goog.provide('goog.i18n.NumberFormatSymbols_lag_TZ');
 goog.provide('goog.i18n.NumberFormatSymbols_lb');
@@ -360,8 +341,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_mgh');
 goog.provide('goog.i18n.NumberFormatSymbols_mgh_MZ');
 goog.provide('goog.i18n.NumberFormatSymbols_mgo');
 goog.provide('goog.i18n.NumberFormatSymbols_mgo_CM');
-goog.provide('goog.i18n.NumberFormatSymbols_mn_Cyrl');
-goog.provide('goog.i18n.NumberFormatSymbols_ms_Latn');
 goog.provide('goog.i18n.NumberFormatSymbols_ms_Latn_BN');
 goog.provide('goog.i18n.NumberFormatSymbols_ms_Latn_SG');
 goog.provide('goog.i18n.NumberFormatSymbols_mua');
@@ -383,10 +362,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_nn');
 goog.provide('goog.i18n.NumberFormatSymbols_nn_NO');
 goog.provide('goog.i18n.NumberFormatSymbols_nnh');
 goog.provide('goog.i18n.NumberFormatSymbols_nnh_CM');
-goog.provide('goog.i18n.NumberFormatSymbols_nr');
-goog.provide('goog.i18n.NumberFormatSymbols_nr_ZA');
-goog.provide('goog.i18n.NumberFormatSymbols_nso');
-goog.provide('goog.i18n.NumberFormatSymbols_nso_ZA');
 goog.provide('goog.i18n.NumberFormatSymbols_nus');
 goog.provide('goog.i18n.NumberFormatSymbols_nus_SD');
 goog.provide('goog.i18n.NumberFormatSymbols_nyn');
@@ -399,7 +374,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_os_GE');
 goog.provide('goog.i18n.NumberFormatSymbols_os_RU');
 goog.provide('goog.i18n.NumberFormatSymbols_pa_Arab');
 goog.provide('goog.i18n.NumberFormatSymbols_pa_Arab_PK');
-goog.provide('goog.i18n.NumberFormatSymbols_pa_Guru');
 goog.provide('goog.i18n.NumberFormatSymbols_ps');
 goog.provide('goog.i18n.NumberFormatSymbols_ps_AF');
 goog.provide('goog.i18n.NumberFormatSymbols_pt_AO');
@@ -461,26 +435,17 @@ goog.provide('goog.i18n.NumberFormatSymbols_so_KE');
 goog.provide('goog.i18n.NumberFormatSymbols_so_SO');
 goog.provide('goog.i18n.NumberFormatSymbols_sq_MK');
 goog.provide('goog.i18n.NumberFormatSymbols_sq_XK');
-goog.provide('goog.i18n.NumberFormatSymbols_sr_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_sr_Cyrl_BA');
 goog.provide('goog.i18n.NumberFormatSymbols_sr_Cyrl_ME');
 goog.provide('goog.i18n.NumberFormatSymbols_sr_Cyrl_XK');
-goog.provide('goog.i18n.NumberFormatSymbols_sr_Latn');
 goog.provide('goog.i18n.NumberFormatSymbols_sr_Latn_BA');
 goog.provide('goog.i18n.NumberFormatSymbols_sr_Latn_ME');
-goog.provide('goog.i18n.NumberFormatSymbols_sr_Latn_RS');
 goog.provide('goog.i18n.NumberFormatSymbols_sr_Latn_XK');
-goog.provide('goog.i18n.NumberFormatSymbols_ss');
-goog.provide('goog.i18n.NumberFormatSymbols_ss_SZ');
-goog.provide('goog.i18n.NumberFormatSymbols_ss_ZA');
-goog.provide('goog.i18n.NumberFormatSymbols_ssy');
-goog.provide('goog.i18n.NumberFormatSymbols_ssy_ER');
 goog.provide('goog.i18n.NumberFormatSymbols_sv_AX');
 goog.provide('goog.i18n.NumberFormatSymbols_sv_FI');
+goog.provide('goog.i18n.NumberFormatSymbols_sw_CD');
 goog.provide('goog.i18n.NumberFormatSymbols_sw_KE');
 goog.provide('goog.i18n.NumberFormatSymbols_sw_UG');
-goog.provide('goog.i18n.NumberFormatSymbols_swc');
-goog.provide('goog.i18n.NumberFormatSymbols_swc_CD');
 goog.provide('goog.i18n.NumberFormatSymbols_ta_LK');
 goog.provide('goog.i18n.NumberFormatSymbols_ta_MY');
 goog.provide('goog.i18n.NumberFormatSymbols_ta_SG');
@@ -490,14 +455,9 @@ goog.provide('goog.i18n.NumberFormatSymbols_teo_UG');
 goog.provide('goog.i18n.NumberFormatSymbols_ti');
 goog.provide('goog.i18n.NumberFormatSymbols_ti_ER');
 goog.provide('goog.i18n.NumberFormatSymbols_ti_ET');
-goog.provide('goog.i18n.NumberFormatSymbols_tn');
-goog.provide('goog.i18n.NumberFormatSymbols_tn_BW');
-goog.provide('goog.i18n.NumberFormatSymbols_tn_ZA');
 goog.provide('goog.i18n.NumberFormatSymbols_to');
 goog.provide('goog.i18n.NumberFormatSymbols_to_TO');
 goog.provide('goog.i18n.NumberFormatSymbols_tr_CY');
-goog.provide('goog.i18n.NumberFormatSymbols_ts');
-goog.provide('goog.i18n.NumberFormatSymbols_ts_ZA');
 goog.provide('goog.i18n.NumberFormatSymbols_twq');
 goog.provide('goog.i18n.NumberFormatSymbols_twq_NE');
 goog.provide('goog.i18n.NumberFormatSymbols_tzm');
@@ -511,16 +471,11 @@ goog.provide('goog.i18n.NumberFormatSymbols_uz_Arab');
 goog.provide('goog.i18n.NumberFormatSymbols_uz_Arab_AF');
 goog.provide('goog.i18n.NumberFormatSymbols_uz_Cyrl');
 goog.provide('goog.i18n.NumberFormatSymbols_uz_Cyrl_UZ');
-goog.provide('goog.i18n.NumberFormatSymbols_uz_Latn');
 goog.provide('goog.i18n.NumberFormatSymbols_vai');
 goog.provide('goog.i18n.NumberFormatSymbols_vai_Latn');
 goog.provide('goog.i18n.NumberFormatSymbols_vai_Latn_LR');
 goog.provide('goog.i18n.NumberFormatSymbols_vai_Vaii');
 goog.provide('goog.i18n.NumberFormatSymbols_vai_Vaii_LR');
-goog.provide('goog.i18n.NumberFormatSymbols_ve');
-goog.provide('goog.i18n.NumberFormatSymbols_ve_ZA');
-goog.provide('goog.i18n.NumberFormatSymbols_vo');
-goog.provide('goog.i18n.NumberFormatSymbols_vo_001');
 goog.provide('goog.i18n.NumberFormatSymbols_vun');
 goog.provide('goog.i18n.NumberFormatSymbols_vun_TZ');
 goog.provide('goog.i18n.NumberFormatSymbols_wae');
@@ -536,7 +491,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_yo_BJ');
 goog.provide('goog.i18n.NumberFormatSymbols_yo_NG');
 goog.provide('goog.i18n.NumberFormatSymbols_zgh');
 goog.provide('goog.i18n.NumberFormatSymbols_zgh_MA');
-goog.provide('goog.i18n.NumberFormatSymbols_zh_Hans');
 goog.provide('goog.i18n.NumberFormatSymbols_zh_Hans_HK');
 goog.provide('goog.i18n.NumberFormatSymbols_zh_Hans_MO');
 goog.provide('goog.i18n.NumberFormatSymbols_zh_Hans_SG');
@@ -548,82 +502,6 @@ goog.provide('goog.i18n.NumberFormatSymbols_zh_Hant_TW');
 goog.require('goog.i18n.NumberFormatSymbols');
 
 
-/**
- * Number formatting symbols for locale aa.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_aa = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ETB'
-};
-
-
-/**
- * Number formatting symbols for locale aa_DJ.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_aa_DJ = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'DJF'
-};
-
-
-/**
- * Number formatting symbols for locale aa_ER.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_aa_ER = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ERN'
-};
-
-
-/**
- * Number formatting symbols for locale aa_ET.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_aa_ET = goog.i18n.NumberFormatSymbols_aa;
-
-
 /**
  * Number formatting symbols for locale af_NA.
  * @enum {string}
@@ -642,7 +520,7 @@ goog.i18n.NumberFormatSymbols_af_NA = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
+  CURRENCY_PATTERN: '\u00A4#,##0.00',
   DEF_CURRENCY_CODE: 'NAD'
 };
 
@@ -799,29 +677,6 @@ goog.i18n.NumberFormatSymbols_ar_DZ = {
 };
 
 
-/**
- * Number formatting symbols for locale ar_EG.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ar_EG = {
-  DECIMAL_SEP: '\u066B',
-  GROUP_SEP: '\u066C',
-  PERCENT: '\u066A',
-  ZERO_DIGIT: '\u0660',
-  PLUS_SIGN: '\u200F+',
-  MINUS_SIGN: '\u200F-',
-  EXP_SYMBOL: '\u0627\u0633',
-  PERMILL: '\u0609',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EGP'
-};
-
-
 /**
  * Number formatting symbols for locale ar_EH.
  * @enum {string}
@@ -1139,7 +994,7 @@ goog.i18n.NumberFormatSymbols_ar_QA = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#0.00',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
   DEF_CURRENCY_CODE: 'QAR'
 };
 
@@ -1162,7 +1017,7 @@ goog.i18n.NumberFormatSymbols_ar_SA = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#0.00',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
   DEF_CURRENCY_CODE: 'SAR'
 };
 
@@ -1254,7 +1109,7 @@ goog.i18n.NumberFormatSymbols_ar_SY = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#0.00',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
   DEF_CURRENCY_CODE: 'SYP'
 };
 
@@ -1300,7 +1155,7 @@ goog.i18n.NumberFormatSymbols_ar_TN = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#0.00',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
   DEF_CURRENCY_CODE: 'TND'
 };
 
@@ -1323,7 +1178,7 @@ goog.i18n.NumberFormatSymbols_ar_YE = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#0.00',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
   DEF_CURRENCY_CODE: 'YER'
 };
 
@@ -1423,29 +1278,6 @@ goog.i18n.NumberFormatSymbols_ast_ES = goog.i18n.NumberFormatSymbols_ast;
  * @enum {string}
  */
 goog.i18n.NumberFormatSymbols_az_Cyrl = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
-/**
- * Number formatting symbols for locale az_Cyrl_AZ.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_az_Cyrl_AZ = {
   DECIMAL_SEP: ',',
   GROUP_SEP: '.',
   PERCENT: '%',
@@ -1465,26 +1297,11 @@ goog.i18n.NumberFormatSymbols_az_Cyrl_AZ = {
 
 
 /**
- * Number formatting symbols for locale az_Latn.
+ * Number formatting symbols for locale az_Cyrl_AZ.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_az_Latn = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_az_Cyrl_AZ =
+    goog.i18n.NumberFormatSymbols_az_Cyrl;
 
 
 /**
@@ -1517,36 +1334,6 @@ goog.i18n.NumberFormatSymbols_bas = {
 goog.i18n.NumberFormatSymbols_bas_CM = goog.i18n.NumberFormatSymbols_bas;
 
 
-/**
- * Number formatting symbols for locale be.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_be = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'BYR'
-};
-
-
-/**
- * Number formatting symbols for locale be_BY.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_be_BY = goog.i18n.NumberFormatSymbols_be;
-
-
 /**
  * Number formatting symbols for locale bem.
  * @enum {string}
@@ -1634,23 +1421,7 @@ goog.i18n.NumberFormatSymbols_bm = {
  * Number formatting symbols for locale bm_Latn.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_bm_Latn = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_bm_Latn = goog.i18n.NumberFormatSymbols_bm;
 
 
 /**
@@ -1766,57 +1537,11 @@ goog.i18n.NumberFormatSymbols_brx = {
 goog.i18n.NumberFormatSymbols_brx_IN = goog.i18n.NumberFormatSymbols_brx;
 
 
-/**
- * Number formatting symbols for locale bs.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_bs = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'BAM'
-};
-
-
 /**
  * Number formatting symbols for locale bs_Cyrl.
  * @enum {string}
  */
 goog.i18n.NumberFormatSymbols_bs_Cyrl = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
-/**
- * Number formatting symbols for locale bs_Cyrl_BA.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_bs_Cyrl_BA = {
   DECIMAL_SEP: ',',
   GROUP_SEP: '.',
   PERCENT: '%',
@@ -1836,33 +1561,11 @@ goog.i18n.NumberFormatSymbols_bs_Cyrl_BA = {
 
 
 /**
- * Number formatting symbols for locale bs_Latn.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_bs_Latn = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
-/**
- * Number formatting symbols for locale bs_Latn_BA.
+ * Number formatting symbols for locale bs_Cyrl_BA.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_bs_Latn_BA = goog.i18n.NumberFormatSymbols_bs;
+goog.i18n.NumberFormatSymbols_bs_Cyrl_BA =
+    goog.i18n.NumberFormatSymbols_bs_Cyrl;
 
 
 /**
@@ -1922,37 +1625,21 @@ goog.i18n.NumberFormatSymbols_ckb = {
  * Number formatting symbols for locale ckb_Arab.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_ckb_Arab = {
-  DECIMAL_SEP: '\u066B',
-  GROUP_SEP: '\u066C',
-  PERCENT: '\u066A',
-  ZERO_DIGIT: '\u0660',
-  PLUS_SIGN: '\u200F+',
-  MINUS_SIGN: '\u200F-',
-  EXP_SYMBOL: '\u0627\u0633',
-  PERMILL: '\u0609',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
-/**
- * Number formatting symbols for locale ckb_Arab_IQ.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ckb_Arab_IQ = goog.i18n.NumberFormatSymbols_ckb;
-
-
-/**
- * Number formatting symbols for locale ckb_Arab_IR.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ckb_Arab_IR = {
+goog.i18n.NumberFormatSymbols_ckb_Arab = goog.i18n.NumberFormatSymbols_ckb;
+
+
+/**
+ * Number formatting symbols for locale ckb_Arab_IQ.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_ckb_Arab_IQ = goog.i18n.NumberFormatSymbols_ckb;
+
+
+/**
+ * Number formatting symbols for locale ckb_Arab_IR.
+ * @enum {string}
+ */
+goog.i18n.NumberFormatSymbols_ckb_Arab_IR = {
   DECIMAL_SEP: '\u066B',
   GROUP_SEP: '\u066C',
   PERCENT: '\u066A',
@@ -2005,23 +1692,7 @@ goog.i18n.NumberFormatSymbols_ckb_IR = {
  * Number formatting symbols for locale ckb_Latn.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_ckb_Latn = {
-  DECIMAL_SEP: '\u066B',
-  GROUP_SEP: '\u066C',
-  PERCENT: '\u066A',
-  ZERO_DIGIT: '\u0660',
-  PLUS_SIGN: '\u200F+',
-  MINUS_SIGN: '\u200F-',
-  EXP_SYMBOL: '\u0627\u0633',
-  PERMILL: '\u0609',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_ckb_Latn = goog.i18n.NumberFormatSymbols_ckb;
 
 
 /**
@@ -2317,29 +1988,6 @@ goog.i18n.NumberFormatSymbols_ee_TG = {
 };
 
 
-/**
- * Number formatting symbols for locale el_CY.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_el_CY = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'e',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
 /**
  * Number formatting symbols for locale en_150.
  * @enum {string}
@@ -2547,29 +2195,6 @@ goog.i18n.NumberFormatSymbols_en_BZ = {
 };
 
 
-/**
- * Number formatting symbols for locale en_CA.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_en_CA = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'CAD'
-};
-
-
 /**
  * Number formatting symbols for locale en_CC.
  * @enum {string}
@@ -3505,10 +3130,10 @@ goog.i18n.NumberFormatSymbols_en_PK = {
   PERMILL: '\u2030',
   INFINITY: '\u221E',
   NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##,##0.###',
+  DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##,##0.00',
+  PERCENT_PATTERN: '#,##0%',
+  CURRENCY_PATTERN: '\u00A4#,##0.00',
   DEF_CURRENCY_CODE: 'PKR'
 };
 
@@ -4256,29 +3881,6 @@ goog.i18n.NumberFormatSymbols_es_HN = {
 };
 
 
-/**
- * Number formatting symbols for locale es_MX.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_es_MX = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'MXN'
-};
-
-
 /**
  * Number formatting symbols for locale es_NI.
  * @enum {string}
@@ -4440,29 +4042,6 @@ goog.i18n.NumberFormatSymbols_es_SV = {
 };
 
 
-/**
- * Number formatting symbols for locale es_US.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_es_US = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0\u00A0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'USD'
-};
-
-
 /**
  * Number formatting symbols for locale es_UY.
  * @enum {string}
@@ -4556,7 +4135,7 @@ goog.i18n.NumberFormatSymbols_fa_AF = {
   NAN: '\u0646\u0627\u0639\u062F\u062F',
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '\'\u202A\'#,##0%\'\u202C\'',
+  PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '\u200E\u00A4#,##0.00',
   DEF_CURRENCY_CODE: 'AFN'
 };
@@ -5696,23 +5275,7 @@ goog.i18n.NumberFormatSymbols_ha = {
  * Number formatting symbols for locale ha_Latn.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_ha_Latn = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_ha_Latn = goog.i18n.NumberFormatSymbols_ha;
 
 
 /**
@@ -5821,36 +5384,6 @@ goog.i18n.NumberFormatSymbols_hsb = {
 goog.i18n.NumberFormatSymbols_hsb_DE = goog.i18n.NumberFormatSymbols_hsb;
 
 
-/**
- * Number formatting symbols for locale ia.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ia = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
-/**
- * Number formatting symbols for locale ia_FR.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ia_FR = goog.i18n.NumberFormatSymbols_ia;
-
-
 /**
  * Number formatting symbols for locale ig.
  * @enum {string}
@@ -6174,29 +5707,6 @@ goog.i18n.NumberFormatSymbols_ki = {
 goog.i18n.NumberFormatSymbols_ki_KE = goog.i18n.NumberFormatSymbols_ki;
 
 
-/**
- * Number formatting symbols for locale kk_Cyrl.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_kk_Cyrl = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
 /**
  * Number formatting symbols for locale kkj.
  * @enum {string}
@@ -6367,23 +5877,7 @@ goog.i18n.NumberFormatSymbols_ks = {
  * Number formatting symbols for locale ks_Arab.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_ks_Arab = {
-  DECIMAL_SEP: '\u066B',
-  GROUP_SEP: '\u066C',
-  PERCENT: '\u066A',
-  ZERO_DIGIT: '\u06F0',
-  PLUS_SIGN: '\u200E+\u200E',
-  MINUS_SIGN: '\u200E-\u200E',
-  EXP_SYMBOL: '\u00D7\u06F1\u06F0^',
-  PERMILL: '\u0609',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_ks_Arab = goog.i18n.NumberFormatSymbols_ks;
 
 
 /**
@@ -6513,29 +6007,6 @@ goog.i18n.NumberFormatSymbols_kw = {
 goog.i18n.NumberFormatSymbols_kw_GB = goog.i18n.NumberFormatSymbols_kw;
 
 
-/**
- * Number formatting symbols for locale ky_Cyrl.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ky_Cyrl = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: '\u0441\u0430\u043D\u00A0\u044D\u043C\u0435\u0441',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
 /**
  * Number formatting symbols for locale lag.
  * @enum {string}
@@ -7019,12 +6490,12 @@ goog.i18n.NumberFormatSymbols_mgo_CM = goog.i18n.NumberFormatSymbols_mgo;
 
 
 /**
- * Number formatting symbols for locale mn_Cyrl.
+ * Number formatting symbols for locale ms_Latn_BN.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_mn_Cyrl = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
+goog.i18n.NumberFormatSymbols_ms_Latn_BN = {
+  DECIMAL_SEP: ',',
+  GROUP_SEP: '.',
   PERCENT: '%',
   ZERO_DIGIT: '0',
   PLUS_SIGN: '+',
@@ -7037,15 +6508,15 @@ goog.i18n.NumberFormatSymbols_mn_Cyrl = {
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
+  DEF_CURRENCY_CODE: 'BND'
 };
 
 
 /**
- * Number formatting symbols for locale ms_Latn.
+ * Number formatting symbols for locale ms_Latn_SG.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_ms_Latn = {
+goog.i18n.NumberFormatSymbols_ms_Latn_SG = {
   DECIMAL_SEP: '.',
   GROUP_SEP: ',',
   PERCENT: '%',
@@ -7060,15 +6531,15 @@ goog.i18n.NumberFormatSymbols_ms_Latn = {
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
+  DEF_CURRENCY_CODE: 'SGD'
 };
 
 
 /**
- * Number formatting symbols for locale ms_Latn_BN.
+ * Number formatting symbols for locale mua.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_ms_Latn_BN = {
+goog.i18n.NumberFormatSymbols_mua = {
   DECIMAL_SEP: ',',
   GROUP_SEP: '.',
   PERCENT: '%',
@@ -7082,59 +6553,13 @@ goog.i18n.NumberFormatSymbols_ms_Latn_BN = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'BND'
+  CURRENCY_PATTERN: '\u00A4#,##0.00',
+  DEF_CURRENCY_CODE: 'XAF'
 };
 
 
 /**
- * Number formatting symbols for locale ms_Latn_SG.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ms_Latn_SG = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'SGD'
-};
-
-
-/**
- * Number formatting symbols for locale mua.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_mua = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'XAF'
-};
-
-
-/**
- * Number formatting symbols for locale mua_CM.
+ * Number formatting symbols for locale mua_CM.
  * @enum {string}
  */
 goog.i18n.NumberFormatSymbols_mua_CM = goog.i18n.NumberFormatSymbols_mua;
@@ -7241,7 +6666,7 @@ goog.i18n.NumberFormatSymbols_nl_AW = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0#,##0.00-',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0-#,##0.00',
   DEF_CURRENCY_CODE: 'AWG'
 };
 
@@ -7287,7 +6712,7 @@ goog.i18n.NumberFormatSymbols_nl_BQ = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0#,##0.00-',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0-#,##0.00',
   DEF_CURRENCY_CODE: 'USD'
 };
 
@@ -7310,7 +6735,7 @@ goog.i18n.NumberFormatSymbols_nl_CW = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0#,##0.00-',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0-#,##0.00',
   DEF_CURRENCY_CODE: 'ANG'
 };
 
@@ -7333,7 +6758,7 @@ goog.i18n.NumberFormatSymbols_nl_SR = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0#,##0.00-',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0-#,##0.00',
   DEF_CURRENCY_CODE: 'SRD'
 };
 
@@ -7356,7 +6781,7 @@ goog.i18n.NumberFormatSymbols_nl_SX = {
   DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0#,##0.00-',
+  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00;\u00A4\u00A0-#,##0.00',
   DEF_CURRENCY_CODE: 'ANG'
 };
 
@@ -7451,66 +6876,6 @@ goog.i18n.NumberFormatSymbols_nnh = {
 goog.i18n.NumberFormatSymbols_nnh_CM = goog.i18n.NumberFormatSymbols_nnh;
 
 
-/**
- * Number formatting symbols for locale nr.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_nr = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ZAR'
-};
-
-
-/**
- * Number formatting symbols for locale nr_ZA.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_nr_ZA = goog.i18n.NumberFormatSymbols_nr;
-
-
-/**
- * Number formatting symbols for locale nso.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_nso = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ZAR'
-};
-
-
-/**
- * Number formatting symbols for locale nso_ZA.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_nso_ZA = goog.i18n.NumberFormatSymbols_nso;
-
-
 /**
  * Number formatting symbols for locale nus.
  * @enum {string}
@@ -7708,29 +7073,6 @@ goog.i18n.NumberFormatSymbols_pa_Arab_PK =
     goog.i18n.NumberFormatSymbols_pa_Arab;
 
 
-/**
- * Number formatting symbols for locale pa_Guru.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_pa_Guru = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##,##0.###',
-  SCIENTIFIC_PATTERN: '[#E0]',
-  PERCENT_PATTERN: '#,##,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
 /**
  * Number formatting symbols for locale ps.
  * @enum {string}
@@ -8569,23 +7911,7 @@ goog.i18n.NumberFormatSymbols_shi = {
  * Number formatting symbols for locale shi_Latn.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_shi_Latn = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '#,##0.00\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_shi_Latn = goog.i18n.NumberFormatSymbols_shi;
 
 
 /**
@@ -8599,23 +7925,7 @@ goog.i18n.NumberFormatSymbols_shi_Latn_MA = goog.i18n.NumberFormatSymbols_shi;
  * Number formatting symbols for locale shi_Tfng.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_shi_Tfng = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '#,##0.00\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_shi_Tfng = goog.i18n.NumberFormatSymbols_shi;
 
 
 /**
@@ -8831,10 +8141,10 @@ goog.i18n.NumberFormatSymbols_sq_XK = {
 
 
 /**
- * Number formatting symbols for locale sr_Cyrl.
+ * Number formatting symbols for locale sr_Cyrl_BA.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_sr_Cyrl = {
+goog.i18n.NumberFormatSymbols_sr_Cyrl_BA = {
   DECIMAL_SEP: ',',
   GROUP_SEP: '.',
   PERCENT: '%',
@@ -8849,15 +8159,15 @@ goog.i18n.NumberFormatSymbols_sr_Cyrl = {
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
+  DEF_CURRENCY_CODE: 'BAM'
 };
 
 
 /**
- * Number formatting symbols for locale sr_Cyrl_BA.
+ * Number formatting symbols for locale sr_Cyrl_ME.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_sr_Cyrl_BA = {
+goog.i18n.NumberFormatSymbols_sr_Cyrl_ME = {
   DECIMAL_SEP: ',',
   GROUP_SEP: '.',
   PERCENT: '%',
@@ -8872,31 +8182,15 @@ goog.i18n.NumberFormatSymbols_sr_Cyrl_BA = {
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'BAM'
+  DEF_CURRENCY_CODE: 'EUR'
 };
 
 
-/**
- * Number formatting symbols for locale sr_Cyrl_ME.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_sr_Cyrl_ME =
-    goog.i18n.NumberFormatSymbols_sr_Cyrl;
-
-
 /**
  * Number formatting symbols for locale sr_Cyrl_XK.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_sr_Cyrl_XK =
-    goog.i18n.NumberFormatSymbols_sr_Cyrl;
-
-
-/**
- * Number formatting symbols for locale sr_Latn.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_sr_Latn = {
+goog.i18n.NumberFormatSymbols_sr_Cyrl_XK = {
   DECIMAL_SEP: ',',
   GROUP_SEP: '.',
   PERCENT: '%',
@@ -8911,7 +8205,7 @@ goog.i18n.NumberFormatSymbols_sr_Latn = {
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'RSD'
+  DEF_CURRENCY_CODE: 'EUR'
 };
 
 
@@ -8961,14 +8255,6 @@ goog.i18n.NumberFormatSymbols_sr_Latn_ME = {
 };
 
 
-/**
- * Number formatting symbols for locale sr_Latn_RS.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_sr_Latn_RS =
-    goog.i18n.NumberFormatSymbols_sr_Latn;
-
-
 /**
  * Number formatting symbols for locale sr_Latn_XK.
  * @enum {string}
@@ -8992,89 +8278,6 @@ goog.i18n.NumberFormatSymbols_sr_Latn_XK = {
 };
 
 
-/**
- * Number formatting symbols for locale ss.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ss = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ZAR'
-};
-
-
-/**
- * Number formatting symbols for locale ss_SZ.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ss_SZ = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'SZL'
-};
-
-
-/**
- * Number formatting symbols for locale ss_ZA.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ss_ZA = goog.i18n.NumberFormatSymbols_ss;
-
-
-/**
- * Number formatting symbols for locale ssy.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ssy = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ERN'
-};
-
-
-/**
- * Number formatting symbols for locale ssy_ER.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ssy_ER = goog.i18n.NumberFormatSymbols_ssy;
-
-
 /**
  * Number formatting symbols for locale sv_AX.
  * @enum {string}
@@ -9122,12 +8325,12 @@ goog.i18n.NumberFormatSymbols_sv_FI = {
 
 
 /**
- * Number formatting symbols for locale sw_KE.
+ * Number formatting symbols for locale sw_CD.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_sw_KE = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
+goog.i18n.NumberFormatSymbols_sw_CD = {
+  DECIMAL_SEP: ',',
+  GROUP_SEP: '.',
   PERCENT: '%',
   ZERO_DIGIT: '0',
   PLUS_SIGN: '+',
@@ -9140,15 +8343,15 @@ goog.i18n.NumberFormatSymbols_sw_KE = {
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'KES'
+  DEF_CURRENCY_CODE: 'CDF'
 };
 
 
 /**
- * Number formatting symbols for locale sw_UG.
+ * Number formatting symbols for locale sw_KE.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_sw_UG = {
+goog.i18n.NumberFormatSymbols_sw_KE = {
   DECIMAL_SEP: '.',
   GROUP_SEP: ',',
   PERCENT: '%',
@@ -9163,17 +8366,17 @@ goog.i18n.NumberFormatSymbols_sw_UG = {
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'UGX'
+  DEF_CURRENCY_CODE: 'KES'
 };
 
 
 /**
- * Number formatting symbols for locale swc.
+ * Number formatting symbols for locale sw_UG.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_swc = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '.',
+goog.i18n.NumberFormatSymbols_sw_UG = {
+  DECIMAL_SEP: '.',
+  GROUP_SEP: ',',
   PERCENT: '%',
   ZERO_DIGIT: '0',
   PLUS_SIGN: '+',
@@ -9186,17 +8389,10 @@ goog.i18n.NumberFormatSymbols_swc = {
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##0%',
   CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'CDF'
+  DEF_CURRENCY_CODE: 'UGX'
 };
 
 
-/**
- * Number formatting symbols for locale swc_CD.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_swc_CD = goog.i18n.NumberFormatSymbols_swc;
-
-
 /**
  * Number formatting symbols for locale ta_LK.
  * @enum {string}
@@ -9372,59 +8568,6 @@ goog.i18n.NumberFormatSymbols_ti_ER = {
 goog.i18n.NumberFormatSymbols_ti_ET = goog.i18n.NumberFormatSymbols_ti;
 
 
-/**
- * Number formatting symbols for locale tn.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_tn = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ZAR'
-};
-
-
-/**
- * Number formatting symbols for locale tn_BW.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_tn_BW = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'BWP'
-};
-
-
-/**
- * Number formatting symbols for locale tn_ZA.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_tn_ZA = goog.i18n.NumberFormatSymbols_tn;
-
-
 /**
  * Number formatting symbols for locale to.
  * @enum {string}
@@ -9478,36 +8621,6 @@ goog.i18n.NumberFormatSymbols_tr_CY = {
 };
 
 
-/**
- * Number formatting symbols for locale ts.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ts = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ZAR'
-};
-
-
-/**
- * Number formatting symbols for locale ts_ZA.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ts_ZA = goog.i18n.NumberFormatSymbols_ts;
-
-
 /**
  * Number formatting symbols for locale twq.
  * @enum {string}
@@ -9565,23 +8678,7 @@ goog.i18n.NumberFormatSymbols_tzm = {
  * Number formatting symbols for locale tzm_Latn.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_tzm_Latn = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_tzm_Latn = goog.i18n.NumberFormatSymbols_tzm;
 
 
 /**
@@ -9618,23 +8715,7 @@ goog.i18n.NumberFormatSymbols_ug = {
  * Number formatting symbols for locale ug_Arab.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_ug_Arab = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_ug_Arab = goog.i18n.NumberFormatSymbols_ug;
 
 
 /**
@@ -9659,7 +8740,7 @@ goog.i18n.NumberFormatSymbols_ur_IN = {
   PERMILL: '\u2030',
   INFINITY: '\u221E',
   NAN: '\u06CC\u06C1\u00A0\u0639\u062F\u062F\u00A0\u0646\u06C1\u06CC\u06BA',
-  DECIMAL_PATTERN: '#,##,##0.###',
+  DECIMAL_PATTERN: '#,##0.###',
   SCIENTIFIC_PATTERN: '#E0',
   PERCENT_PATTERN: '#,##,##0%',
   CURRENCY_PATTERN: '\u00A4\u00A0#,##,##0.00',
@@ -9703,29 +8784,6 @@ goog.i18n.NumberFormatSymbols_uz_Arab_AF =
  * @enum {string}
  */
 goog.i18n.NumberFormatSymbols_uz_Cyrl = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
-/**
- * Number formatting symbols for locale uz_Cyrl_UZ.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_uz_Cyrl_UZ = {
   DECIMAL_SEP: ',',
   GROUP_SEP: '\u00A0',
   PERCENT: '%',
@@ -9745,26 +8803,11 @@ goog.i18n.NumberFormatSymbols_uz_Cyrl_UZ = {
 
 
 /**
- * Number formatting symbols for locale uz_Latn.
+ * Number formatting symbols for locale uz_Cyrl_UZ.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_uz_Latn = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_uz_Cyrl_UZ =
+    goog.i18n.NumberFormatSymbols_uz_Cyrl;
 
 
 /**
@@ -9794,23 +8837,7 @@ goog.i18n.NumberFormatSymbols_vai = {
  * Number formatting symbols for locale vai_Latn.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_vai_Latn = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_vai_Latn = goog.i18n.NumberFormatSymbols_vai;
 
 
 /**
@@ -9824,23 +8851,7 @@ goog.i18n.NumberFormatSymbols_vai_Latn_LR = goog.i18n.NumberFormatSymbols_vai;
  * Number formatting symbols for locale vai_Vaii.
  * @enum {string}
  */
-goog.i18n.NumberFormatSymbols_vai_Vaii = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
+goog.i18n.NumberFormatSymbols_vai_Vaii = goog.i18n.NumberFormatSymbols_vai;
 
 
 /**
@@ -9850,66 +8861,6 @@ goog.i18n.NumberFormatSymbols_vai_Vaii = {
 goog.i18n.NumberFormatSymbols_vai_Vaii_LR = goog.i18n.NumberFormatSymbols_vai;
 
 
-/**
- * Number formatting symbols for locale ve.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ve = {
-  DECIMAL_SEP: ',',
-  GROUP_SEP: '\u00A0',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4#,##0.00',
-  DEF_CURRENCY_CODE: 'ZAR'
-};
-
-
-/**
- * Number formatting symbols for locale ve_ZA.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_ve_ZA = goog.i18n.NumberFormatSymbols_ve;
-
-
-/**
- * Number formatting symbols for locale vo.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_vo = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'USD'
-};
-
-
-/**
- * Number formatting symbols for locale vo_001.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_vo_001 = goog.i18n.NumberFormatSymbols_vo;
-
-
 /**
  * Number formatting symbols for locale vun.
  * @enum {string}
@@ -10143,29 +9094,6 @@ goog.i18n.NumberFormatSymbols_zgh = {
 goog.i18n.NumberFormatSymbols_zgh_MA = goog.i18n.NumberFormatSymbols_zgh;
 
 
-/**
- * Number formatting symbols for locale zh_Hans.
- * @enum {string}
- */
-goog.i18n.NumberFormatSymbols_zh_Hans = {
-  DECIMAL_SEP: '.',
-  GROUP_SEP: ',',
-  PERCENT: '%',
-  ZERO_DIGIT: '0',
-  PLUS_SIGN: '+',
-  MINUS_SIGN: '-',
-  EXP_SYMBOL: 'E',
-  PERMILL: '\u2030',
-  INFINITY: '\u221E',
-  NAN: 'NaN',
-  DECIMAL_PATTERN: '#,##0.###',
-  SCIENTIFIC_PATTERN: '#E0',
-  PERCENT_PATTERN: '#,##0%',
-  CURRENCY_PATTERN: '\u00A4\u00A0#,##0.00',
-  DEF_CURRENCY_CODE: 'EUR'
-};
-
-
 /**
  * Number formatting symbols for locale zh_Hans_HK.
  * @enum {string}
@@ -10316,22 +9244,6 @@ goog.i18n.NumberFormatSymbols_zh_Hant_TW =
  * Selected number formatting symbols by locale.
  */
 
-if (goog.LOCALE == 'aa') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_aa;
-}
-
-if (goog.LOCALE == 'aa_DJ' || goog.LOCALE == 'aa-DJ') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_aa_DJ;
-}
-
-if (goog.LOCALE == 'aa_ER' || goog.LOCALE == 'aa-ER') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_aa_ER;
-}
-
-if (goog.LOCALE == 'aa_ET' || goog.LOCALE == 'aa-ET') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_aa;
-}
-
 if (goog.LOCALE == 'af_NA' || goog.LOCALE == 'af-NA') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_af_NA;
 }
@@ -10368,10 +9280,6 @@ if (goog.LOCALE == 'ar_DZ' || goog.LOCALE == 'ar-DZ') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ar_DZ;
 }
 
-if (goog.LOCALE == 'ar_EG' || goog.LOCALE == 'ar-EG') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ar_EG;
-}
-
 if (goog.LOCALE == 'ar_EH' || goog.LOCALE == 'ar-EH') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ar_EH;
 }
@@ -10489,11 +9397,7 @@ if (goog.LOCALE == 'az_Cyrl' || goog.LOCALE == 'az-Cyrl') {
 }
 
 if (goog.LOCALE == 'az_Cyrl_AZ' || goog.LOCALE == 'az-Cyrl-AZ') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_az_Cyrl_AZ;
-}
-
-if (goog.LOCALE == 'az_Latn' || goog.LOCALE == 'az-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_az_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_az_Cyrl;
 }
 
 if (goog.LOCALE == 'bas') {
@@ -10504,14 +9408,6 @@ if (goog.LOCALE == 'bas_CM' || goog.LOCALE == 'bas-CM') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bas;
 }
 
-if (goog.LOCALE == 'be') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_be;
-}
-
-if (goog.LOCALE == 'be_BY' || goog.LOCALE == 'be-BY') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_be;
-}
-
 if (goog.LOCALE == 'bem') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bem;
 }
@@ -10533,7 +9429,7 @@ if (goog.LOCALE == 'bm') {
 }
 
 if (goog.LOCALE == 'bm_Latn' || goog.LOCALE == 'bm-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bm_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bm;
 }
 
 if (goog.LOCALE == 'bm_Latn_ML' || goog.LOCALE == 'bm-Latn-ML') {
@@ -10564,24 +9460,12 @@ if (goog.LOCALE == 'brx_IN' || goog.LOCALE == 'brx-IN') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_brx;
 }
 
-if (goog.LOCALE == 'bs') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs;
-}
-
 if (goog.LOCALE == 'bs_Cyrl' || goog.LOCALE == 'bs-Cyrl') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs_Cyrl;
 }
 
 if (goog.LOCALE == 'bs_Cyrl_BA' || goog.LOCALE == 'bs-Cyrl-BA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs_Cyrl_BA;
-}
-
-if (goog.LOCALE == 'bs_Latn' || goog.LOCALE == 'bs-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs_Latn;
-}
-
-if (goog.LOCALE == 'bs_Latn_BA' || goog.LOCALE == 'bs-Latn-BA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_bs_Cyrl;
 }
 
 if (goog.LOCALE == 'cgg') {
@@ -10597,7 +9481,7 @@ if (goog.LOCALE == 'ckb') {
 }
 
 if (goog.LOCALE == 'ckb_Arab' || goog.LOCALE == 'ckb-Arab') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ckb_Arab;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ckb;
 }
 
 if (goog.LOCALE == 'ckb_Arab_IQ' || goog.LOCALE == 'ckb-Arab-IQ') {
@@ -10617,7 +9501,7 @@ if (goog.LOCALE == 'ckb_IR' || goog.LOCALE == 'ckb-IR') {
 }
 
 if (goog.LOCALE == 'ckb_Latn' || goog.LOCALE == 'ckb-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ckb_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ckb;
 }
 
 if (goog.LOCALE == 'ckb_Latn_IQ' || goog.LOCALE == 'ckb-Latn-IQ') {
@@ -10696,10 +9580,6 @@ if (goog.LOCALE == 'ee_TG' || goog.LOCALE == 'ee-TG') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ee_TG;
 }
 
-if (goog.LOCALE == 'el_CY' || goog.LOCALE == 'el-CY') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_el_CY;
-}
-
 if (goog.LOCALE == 'en_150' || goog.LOCALE == 'en-150') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_en_150;
 }
@@ -10736,10 +9616,6 @@ if (goog.LOCALE == 'en_BZ' || goog.LOCALE == 'en-BZ') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_en_BZ;
 }
 
-if (goog.LOCALE == 'en_CA' || goog.LOCALE == 'en-CA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_en_CA;
-}
-
 if (goog.LOCALE == 'en_CC' || goog.LOCALE == 'en-CC') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_en_CC;
 }
@@ -11036,10 +9912,6 @@ if (goog.LOCALE == 'es_HN' || goog.LOCALE == 'es-HN') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es_HN;
 }
 
-if (goog.LOCALE == 'es_MX' || goog.LOCALE == 'es-MX') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es_MX;
-}
-
 if (goog.LOCALE == 'es_NI' || goog.LOCALE == 'es-NI') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es_NI;
 }
@@ -11068,10 +9940,6 @@ if (goog.LOCALE == 'es_SV' || goog.LOCALE == 'es-SV') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es_SV;
 }
 
-if (goog.LOCALE == 'es_US' || goog.LOCALE == 'es-US') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es_US;
-}
-
 if (goog.LOCALE == 'es_UY' || goog.LOCALE == 'es-UY') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_es_UY;
 }
@@ -11309,7 +10177,7 @@ if (goog.LOCALE == 'ha') {
 }
 
 if (goog.LOCALE == 'ha_Latn' || goog.LOCALE == 'ha-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ha_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ha;
 }
 
 if (goog.LOCALE == 'ha_Latn_GH' || goog.LOCALE == 'ha-Latn-GH') {
@@ -11336,14 +10204,6 @@ if (goog.LOCALE == 'hsb_DE' || goog.LOCALE == 'hsb-DE') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_hsb;
 }
 
-if (goog.LOCALE == 'ia') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ia;
-}
-
-if (goog.LOCALE == 'ia_FR' || goog.LOCALE == 'ia-FR') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ia;
-}
-
 if (goog.LOCALE == 'ig') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ig;
 }
@@ -11428,10 +10288,6 @@ if (goog.LOCALE == 'ki_KE' || goog.LOCALE == 'ki-KE') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ki;
 }
 
-if (goog.LOCALE == 'kk_Cyrl' || goog.LOCALE == 'kk-Cyrl') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_kk_Cyrl;
-}
-
 if (goog.LOCALE == 'kkj') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_kkj;
 }
@@ -11473,7 +10329,7 @@ if (goog.LOCALE == 'ks') {
 }
 
 if (goog.LOCALE == 'ks_Arab' || goog.LOCALE == 'ks-Arab') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ks_Arab;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ks;
 }
 
 if (goog.LOCALE == 'ks_Arab_IN' || goog.LOCALE == 'ks-Arab-IN') {
@@ -11512,10 +10368,6 @@ if (goog.LOCALE == 'kw_GB' || goog.LOCALE == 'kw-GB') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_kw;
 }
 
-if (goog.LOCALE == 'ky_Cyrl' || goog.LOCALE == 'ky-Cyrl') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ky_Cyrl;
-}
-
 if (goog.LOCALE == 'lag') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_lag;
 }
@@ -11636,14 +10488,6 @@ if (goog.LOCALE == 'mgo_CM' || goog.LOCALE == 'mgo-CM') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_mgo;
 }
 
-if (goog.LOCALE == 'mn_Cyrl' || goog.LOCALE == 'mn-Cyrl') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_mn_Cyrl;
-}
-
-if (goog.LOCALE == 'ms_Latn' || goog.LOCALE == 'ms-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ms_Latn;
-}
-
 if (goog.LOCALE == 'ms_Latn_BN' || goog.LOCALE == 'ms-Latn-BN') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ms_Latn_BN;
 }
@@ -11728,22 +10572,6 @@ if (goog.LOCALE == 'nnh_CM' || goog.LOCALE == 'nnh-CM') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_nnh;
 }
 
-if (goog.LOCALE == 'nr') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_nr;
-}
-
-if (goog.LOCALE == 'nr_ZA' || goog.LOCALE == 'nr-ZA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_nr;
-}
-
-if (goog.LOCALE == 'nso') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_nso;
-}
-
-if (goog.LOCALE == 'nso_ZA' || goog.LOCALE == 'nso-ZA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_nso;
-}
-
 if (goog.LOCALE == 'nus') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_nus;
 }
@@ -11792,10 +10620,6 @@ if (goog.LOCALE == 'pa_Arab_PK' || goog.LOCALE == 'pa-Arab-PK') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_pa_Arab;
 }
 
-if (goog.LOCALE == 'pa_Guru' || goog.LOCALE == 'pa-Guru') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_pa_Guru;
-}
-
 if (goog.LOCALE == 'ps') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ps;
 }
@@ -11981,7 +10805,7 @@ if (goog.LOCALE == 'shi') {
 }
 
 if (goog.LOCALE == 'shi_Latn' || goog.LOCALE == 'shi-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_shi_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_shi;
 }
 
 if (goog.LOCALE == 'shi_Latn_MA' || goog.LOCALE == 'shi-Latn-MA') {
@@ -11989,7 +10813,7 @@ if (goog.LOCALE == 'shi_Latn_MA' || goog.LOCALE == 'shi-Latn-MA') {
 }
 
 if (goog.LOCALE == 'shi_Tfng' || goog.LOCALE == 'shi-Tfng') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_shi_Tfng;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_shi;
 }
 
 if (goog.LOCALE == 'shi_Tfng_MA' || goog.LOCALE == 'shi-Tfng-MA') {
@@ -12040,24 +10864,16 @@ if (goog.LOCALE == 'sq_XK' || goog.LOCALE == 'sq-XK') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sq_XK;
 }
 
-if (goog.LOCALE == 'sr_Cyrl' || goog.LOCALE == 'sr-Cyrl') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Cyrl;
-}
-
 if (goog.LOCALE == 'sr_Cyrl_BA' || goog.LOCALE == 'sr-Cyrl-BA') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Cyrl_BA;
 }
 
 if (goog.LOCALE == 'sr_Cyrl_ME' || goog.LOCALE == 'sr-Cyrl-ME') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Cyrl;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Cyrl_ME;
 }
 
 if (goog.LOCALE == 'sr_Cyrl_XK' || goog.LOCALE == 'sr-Cyrl-XK') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Cyrl;
-}
-
-if (goog.LOCALE == 'sr_Latn' || goog.LOCALE == 'sr-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Cyrl_XK;
 }
 
 if (goog.LOCALE == 'sr_Latn_BA' || goog.LOCALE == 'sr-Latn-BA') {
@@ -12068,34 +10884,10 @@ if (goog.LOCALE == 'sr_Latn_ME' || goog.LOCALE == 'sr-Latn-ME') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Latn_ME;
 }
 
-if (goog.LOCALE == 'sr_Latn_RS' || goog.LOCALE == 'sr-Latn-RS') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Latn;
-}
-
 if (goog.LOCALE == 'sr_Latn_XK' || goog.LOCALE == 'sr-Latn-XK') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sr_Latn_XK;
 }
 
-if (goog.LOCALE == 'ss') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ss;
-}
-
-if (goog.LOCALE == 'ss_SZ' || goog.LOCALE == 'ss-SZ') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ss_SZ;
-}
-
-if (goog.LOCALE == 'ss_ZA' || goog.LOCALE == 'ss-ZA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ss;
-}
-
-if (goog.LOCALE == 'ssy') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ssy;
-}
-
-if (goog.LOCALE == 'ssy_ER' || goog.LOCALE == 'ssy-ER') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ssy;
-}
-
 if (goog.LOCALE == 'sv_AX' || goog.LOCALE == 'sv-AX') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sv_AX;
 }
@@ -12104,6 +10896,10 @@ if (goog.LOCALE == 'sv_FI' || goog.LOCALE == 'sv-FI') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sv_FI;
 }
 
+if (goog.LOCALE == 'sw_CD' || goog.LOCALE == 'sw-CD') {
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sw_CD;
+}
+
 if (goog.LOCALE == 'sw_KE' || goog.LOCALE == 'sw-KE') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sw_KE;
 }
@@ -12112,14 +10908,6 @@ if (goog.LOCALE == 'sw_UG' || goog.LOCALE == 'sw-UG') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_sw_UG;
 }
 
-if (goog.LOCALE == 'swc') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_swc;
-}
-
-if (goog.LOCALE == 'swc_CD' || goog.LOCALE == 'swc-CD') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_swc;
-}
-
 if (goog.LOCALE == 'ta_LK' || goog.LOCALE == 'ta-LK') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ta_LK;
 }
@@ -12156,18 +10944,6 @@ if (goog.LOCALE == 'ti_ET' || goog.LOCALE == 'ti-ET') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ti;
 }
 
-if (goog.LOCALE == 'tn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_tn;
-}
-
-if (goog.LOCALE == 'tn_BW' || goog.LOCALE == 'tn-BW') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_tn_BW;
-}
-
-if (goog.LOCALE == 'tn_ZA' || goog.LOCALE == 'tn-ZA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_tn;
-}
-
 if (goog.LOCALE == 'to') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_to;
 }
@@ -12180,14 +10956,6 @@ if (goog.LOCALE == 'tr_CY' || goog.LOCALE == 'tr-CY') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_tr_CY;
 }
 
-if (goog.LOCALE == 'ts') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ts;
-}
-
-if (goog.LOCALE == 'ts_ZA' || goog.LOCALE == 'ts-ZA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ts;
-}
-
 if (goog.LOCALE == 'twq') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_twq;
 }
@@ -12201,7 +10969,7 @@ if (goog.LOCALE == 'tzm') {
 }
 
 if (goog.LOCALE == 'tzm_Latn' || goog.LOCALE == 'tzm-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_tzm_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_tzm;
 }
 
 if (goog.LOCALE == 'tzm_Latn_MA' || goog.LOCALE == 'tzm-Latn-MA') {
@@ -12213,7 +10981,7 @@ if (goog.LOCALE == 'ug') {
 }
 
 if (goog.LOCALE == 'ug_Arab' || goog.LOCALE == 'ug-Arab') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ug_Arab;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ug;
 }
 
 if (goog.LOCALE == 'ug_Arab_CN' || goog.LOCALE == 'ug-Arab-CN') {
@@ -12237,11 +11005,7 @@ if (goog.LOCALE == 'uz_Cyrl' || goog.LOCALE == 'uz-Cyrl') {
 }
 
 if (goog.LOCALE == 'uz_Cyrl_UZ' || goog.LOCALE == 'uz-Cyrl-UZ') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_uz_Cyrl_UZ;
-}
-
-if (goog.LOCALE == 'uz_Latn' || goog.LOCALE == 'uz-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_uz_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_uz_Cyrl;
 }
 
 if (goog.LOCALE == 'vai') {
@@ -12249,7 +11013,7 @@ if (goog.LOCALE == 'vai') {
 }
 
 if (goog.LOCALE == 'vai_Latn' || goog.LOCALE == 'vai-Latn') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_vai_Latn;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_vai;
 }
 
 if (goog.LOCALE == 'vai_Latn_LR' || goog.LOCALE == 'vai-Latn-LR') {
@@ -12257,29 +11021,13 @@ if (goog.LOCALE == 'vai_Latn_LR' || goog.LOCALE == 'vai-Latn-LR') {
 }
 
 if (goog.LOCALE == 'vai_Vaii' || goog.LOCALE == 'vai-Vaii') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_vai_Vaii;
+  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_vai;
 }
 
 if (goog.LOCALE == 'vai_Vaii_LR' || goog.LOCALE == 'vai-Vaii-LR') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_vai;
 }
 
-if (goog.LOCALE == 've') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ve;
-}
-
-if (goog.LOCALE == 've_ZA' || goog.LOCALE == 've-ZA') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_ve;
-}
-
-if (goog.LOCALE == 'vo') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_vo;
-}
-
-if (goog.LOCALE == 'vo_001' || goog.LOCALE == 'vo-001') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_vo;
-}
-
 if (goog.LOCALE == 'vun') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_vun;
 }
@@ -12340,10 +11088,6 @@ if (goog.LOCALE == 'zgh_MA' || goog.LOCALE == 'zgh-MA') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_zgh;
 }
 
-if (goog.LOCALE == 'zh_Hans' || goog.LOCALE == 'zh-Hans') {
-  goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_zh_Hans;
-}
-
 if (goog.LOCALE == 'zh_Hans_HK' || goog.LOCALE == 'zh-Hans-HK') {
   goog.i18n.NumberFormatSymbols = goog.i18n.NumberFormatSymbols_zh_Hans_HK;
 }
diff --git a/i18n/closure/pluralRules.js b/i18n/closure/pluralRules.js
index 78f3c7fb1a9e..69d21950a365 100644
--- a/i18n/closure/pluralRules.js
+++ b/i18n/closure/pluralRules.js
@@ -17,7 +17,7 @@
  *
  * This file is autogenerated by script:
  *   http://go/generate_pluralrules.py
- * File generated from CLDR ver. 26
+ * File generated from CLDR ver. 27.0.1
  *
  * Before check in, this file could have been manually edited. This is to
  * incorporate changes before we could fix CLDR. All manual modification must be
@@ -821,6 +821,9 @@ if (goog.LOCALE == 'ar') {
 if (goog.LOCALE == 'az') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.esSelect_;
 }
+if (goog.LOCALE == 'be') {
+  goog.i18n.pluralRules.select = goog.i18n.pluralRules.beSelect_;
+}
 if (goog.LOCALE == 'bg') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.esSelect_;
 }
@@ -830,6 +833,9 @@ if (goog.LOCALE == 'bn') {
 if (goog.LOCALE == 'br') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.brSelect_;
 }
+if (goog.LOCALE == 'bs') {
+  goog.i18n.pluralRules.select = goog.i18n.pluralRules.srSelect_;
+}
 if (goog.LOCALE == 'ca') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.enSelect_;
 }
@@ -863,6 +869,9 @@ if (goog.LOCALE == 'en') {
 if (goog.LOCALE == 'en_AU' || goog.LOCALE == 'en-AU') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.enSelect_;
 }
+if (goog.LOCALE == 'en_CA' || goog.LOCALE == 'en-CA') {
+  goog.i18n.pluralRules.select = goog.i18n.pluralRules.enSelect_;
+}
 if (goog.LOCALE == 'en_GB' || goog.LOCALE == 'en-GB') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.enSelect_;
 }
@@ -890,6 +899,12 @@ if (goog.LOCALE == 'es_419' || goog.LOCALE == 'es-419') {
 if (goog.LOCALE == 'es_ES' || goog.LOCALE == 'es-ES') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.esSelect_;
 }
+if (goog.LOCALE == 'es_MX' || goog.LOCALE == 'es-MX') {
+  goog.i18n.pluralRules.select = goog.i18n.pluralRules.esSelect_;
+}
+if (goog.LOCALE == 'es_US' || goog.LOCALE == 'es-US') {
+  goog.i18n.pluralRules.select = goog.i18n.pluralRules.esSelect_;
+}
 if (goog.LOCALE == 'et') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.enSelect_;
 }
@@ -1070,6 +1085,9 @@ if (goog.LOCALE == 'sq') {
 if (goog.LOCALE == 'sr') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.srSelect_;
 }
+if (goog.LOCALE == 'sr_Latn' || goog.LOCALE == 'sr-Latn') {
+  goog.i18n.pluralRules.select = goog.i18n.pluralRules.srSelect_;
+}
 if (goog.LOCALE == 'sv') {
   goog.i18n.pluralRules.select = goog.i18n.pluralRules.enSelect_;
 }
diff --git a/i18n/spec/closureI18nExtractorSpec.js b/i18n/spec/closureI18nExtractorSpec.js
index 0b5a3faace14..07641ca9ffce 100644
--- a/i18n/spec/closureI18nExtractorSpec.js
+++ b/i18n/spec/closureI18nExtractorSpec.js
@@ -184,7 +184,11 @@ describe("extractDateTimeSymbols", function() {
                       'nov.', 'déc.'],
                   DAY: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
                   SHORTDAY: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
+                  FIRSTDAYOFWEEK: 6,
+                  WEEKENDRANGE: [5, 6],
                   AMPMS: ['AM', 'PM'],
+                  ERAS: ['av. J.-C.', 'ap. J.-C.'],
+                  ERANAMES: ['avant Jésus-Christ', 'après Jésus-Christ'],
                   medium: 'yyyy-MM-dd HH:mm:ss',
                   short: 'yy-MM-dd HH:mm',
                   fullDate: 'EEEE d MMMM y',
diff --git a/i18n/spec/parserSpec.js b/i18n/spec/parserSpec.js
index e9aff2bedb19..aea80a885abb 100644
--- a/i18n/spec/parserSpec.js
+++ b/i18n/spec/parserSpec.js
@@ -38,16 +38,16 @@ describe('parsePattern', function() {
     parseAndExpect('#,##,##0.00\u00A4', '', '-', '\u00A4', '\u00A4', 1, 2, 2, 2, 3);
     parseAndExpect('#,##,##0.00\u00A4;(#,##,##0.00\u00A4)',
                    '', '(', '\u00A4', '\u00A4)', 1, 2, 2, 2, 3);
-    parseAndExpect('\u00A4#,##0.00', '\u00A4', '\u00A4-', '', '', 1, 2, 2, 3, 3);
+    parseAndExpect('\u00A4#,##0.00', '\u00A4', '-\u00A4', '', '', 1, 2, 2, 3, 3);
     parseAndExpect('\u00A4#,##0.00;(\u00A4#,##0.00)',
                    '\u00A4', '(\u00A4', '', ')', 1, 2, 2, 3, 3);
     parseAndExpect('\u00A4#,##0.00;\u00A4-#,##0.00',
                    '\u00A4', '\u00A4-', '', '', 1, 2, 2, 3, 3);
-    parseAndExpect('\u00A4 #,##0.00', '\u00A4 ', '\u00A4 -', '', '', 1, 2, 2, 3, 3);
+    parseAndExpect('\u00A4 #,##0.00', '\u00A4 ', '-\u00A4 ', '', '', 1, 2, 2, 3, 3);
     parseAndExpect('\u00A4 #,##0.00;\u00A4-#,##0.00',
                    '\u00A4 ', '\u00A4-', '', '', 1, 2, 2, 3, 3);
     parseAndExpect('\u00A4 #,##0.00;\u00A4 #,##0.00-',
                    '\u00A4 ', '\u00A4 ', '', '-', 1, 2, 2, 3, 3);
-    parseAndExpect('\u00A4 #,##,##0.00', '\u00A4 ', '\u00A4 -', '', '', 1, 2, 2, 2, 3);
+    parseAndExpect('\u00A4 #,##,##0.00', '\u00A4 ', '-\u00A4 ', '', '', 1, 2, 2, 2, 3);
   });
 });
diff --git a/i18n/src/converter.js b/i18n/src/converter.js
index a318726ae015..259dbd0e747a 100644
--- a/i18n/src/converter.js
+++ b/i18n/src/converter.js
@@ -42,6 +42,10 @@ function convertDatetimeData(dataObj) {
   datetimeFormats.DAY = dataObj.WEEKDAYS;
   datetimeFormats.SHORTDAY = dataObj.SHORTWEEKDAYS;
   datetimeFormats.AMPMS = dataObj.AMPMS;
+  datetimeFormats.FIRSTDAYOFWEEK = dataObj.FIRSTDAYOFWEEK;
+  datetimeFormats.WEEKENDRANGE = dataObj.WEEKENDRANGE;
+  datetimeFormats.ERAS = dataObj.ERAS;
+  datetimeFormats.ERANAMES = dataObj.ERANAMES;
 
 
   datetimeFormats.medium      = dataObj.DATEFORMATS[2] + ' ' + dataObj.TIMEFORMATS[2];
diff --git a/i18n/src/parser.js b/i18n/src/parser.js
index e07f27157f88..94330453e43a 100644
--- a/i18n/src/parser.js
+++ b/i18n/src/parser.js
@@ -56,7 +56,7 @@ function parsePattern(pattern) {
     p.negSuf = negative.substr(pos + trunkLen).replace(/\'/g, '');
   } else {
     // hardcoded '-' sign is fine as all locale use '-' as MINUS_SIGN. (\u2212 is the same as '-')
-    p.negPre = p.posPre + '-';
+    p.negPre = '-' + p.posPre;
     p.negSuf = p.posSuf;
   }
 
diff --git a/karma-shared.conf.js b/karma-shared.conf.js
index 1f0fe672284e..3885f0b98c5e 100644
--- a/karma-shared.conf.js
+++ b/karma-shared.conf.js
@@ -66,6 +66,12 @@ module.exports = function(config, specificOptions) {
         platform: 'Windows 8.1',
         version: '11'
       },
+      'SL_iOS': {
+        base: "SauceLabs",
+        browserName: "iphone",
+        platform: "OS X 10.10",
+        version: "8.1"
+      },
 
       'BS_Chrome': {
         base: 'BrowserStack',
@@ -105,6 +111,12 @@ module.exports = function(config, specificOptions) {
         browser_version: '11.0',
         os: 'Windows',
         os_version: '8.1'
+      },
+      'BS_iOS': {
+        base: 'BrowserStack',
+        device: 'iPhone 6',
+        os: 'ios',
+        os_version: '8.0'
       }
     }
   });
diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index 4ef97500f1b1..204db413ecf2 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -14,13 +14,6 @@ var CSP_CSS_HEADER = '/* Include this file in your html if you are using the CSP
 
 module.exports = {
 
-  init: function() {
-    if (!process.env.TRAVIS) {
-      shell.exec('npm install');
-    }
-  },
-
-
   startKarma: function(config, singleRun, done){
     var browsers = grunt.option('browsers');
     var reporters = grunt.option('reporters');
@@ -123,7 +116,7 @@ module.exports = {
         .replace(/\\/g, '\\\\')
         .replace(/'/g, "\\'")
         .replace(/\r?\n/g, '\\n');
-      js = "!window.angular.$$csp() && window.angular.element(document).find('head').prepend('<style type=\"text/css\">" + css + "</style>');";
+      js = "!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type=\"text/css\">" + css + "</style>');";
       state.js.push(js);
 
       return state;
@@ -192,14 +185,16 @@ module.exports = {
     var mapFileName = mapFile.match(/[^\/]+$/)[0];
     var errorFileName = file.replace(/\.js$/, '-errors.json');
     var versionNumber = grunt.config('NG_VERSION').full;
+    var compilationLevel = (file === 'build/angular-message-format.js') ?
+        'ADVANCED_OPTIMIZATIONS' : 'SIMPLE_OPTIMIZATIONS';
     shell.exec(
         'java ' +
             this.java32flags() + ' ' +
-            '-Xmx2g ' +
+            this.memoryRequirement() + ' ' +
             '-cp bower_components/closure-compiler/compiler.jar' + classPathSep +
             'bower_components/ng-closure-runner/ngcompiler.jar ' +
             'org.angularjs.closurerunner.NgClosureRunner ' +
-            '--compilation_level SIMPLE_OPTIMIZATIONS ' +
+            '--compilation_level ' + compilationLevel + ' ' +
             '--language_in ECMASCRIPT5_STRICT ' +
             '--minerr_pass ' +
             '--minerr_errors ' + errorFileName + ' ' +
@@ -222,6 +217,10 @@ module.exports = {
     }.bind(this));
   },
 
+  memoryRequirement: function() {
+    return (process.platform === 'win32') ? '' : '-Xmx2g';
+  },
+
 
   //returns the 32-bit mode force flags for java compiler if supported, this makes the build much faster
   java32flags: function(){
diff --git a/lib/promises-aplus/promises-aplus-test-adapter.js b/lib/promises-aplus/promises-aplus-test-adapter.js
index ba1ad125902b..6189dd27e0d2 100644
--- a/lib/promises-aplus/promises-aplus-test-adapter.js
+++ b/lib/promises-aplus/promises-aplus-test-adapter.js
@@ -11,6 +11,20 @@ var minErr = function minErr (module, constructor) {
   };
 };
 
+var extend = function extend(dst) {
+  for (var i = 1, ii = arguments.length; i < ii; i++) {
+    var obj = arguments[i];
+    if (obj) {
+      var keys = Object.keys(obj);
+      for (var j = 0, jj = keys.length; j < jj; j++) {
+        var key = keys[j];
+        dst[key] = obj[key];
+      }
+    }
+  }
+  return dst;
+};
+
 var $q = qFactory(process.nextTick, function noopExceptionHandler() {});
 
 exports.resolved = $q.resolve;
diff --git a/lib/saucelabs/start_tunnel.sh b/lib/saucelabs/start_tunnel.sh
index dcaa79788226..c3018da8d2aa 100755
--- a/lib/saucelabs/start_tunnel.sh
+++ b/lib/saucelabs/start_tunnel.sh
@@ -12,9 +12,9 @@ set -e
 # before_script:
 #   - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
 
-CONNECT_URL="https://saucelabs.com/downloads/sc-4.3-linux.tar.gz"
+CONNECT_URL="https://saucelabs.com/downloads/sc-4.3.7-linux.tar.gz"
 CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
-CONNECT_DOWNLOAD="sc-4.3-linux.tar.gz"
+CONNECT_DOWNLOAD="sc-4.3.7-linux.tar.gz"
 
 CONNECT_LOG="$LOGS_DIR/sauce-connect"
 CONNECT_STDOUT="$LOGS_DIR/sauce-connect.stdout"
@@ -46,5 +46,5 @@ echo "Starting Sauce Connect in the background, logging into:"
 echo "  $CONNECT_LOG"
 echo "  $CONNECT_STDOUT"
 echo "  $CONNECT_STDERR"
-sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS -v \
+sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \
   --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT &
diff --git a/lib/versions/version-info.js b/lib/versions/version-info.js
index d4a4208addda..9de1d7de68a6 100644
--- a/lib/versions/version-info.js
+++ b/lib/versions/version-info.js
@@ -110,10 +110,16 @@ var getPreviousVersions =  function() {
       })
       .filter()
       .map(function(version) {
+        // angular.js didn't follow semantic version until 1.20rc1
+        if ((version.major === 1 && version.minor === 0 && version.prerelease.length > 0) || (version.major === 1 && version.minor === 2 && version.prerelease[0] === 'rc1')) {
+          version.version = [version.major, version.minor, version.patch].join('.') + version.prerelease.join('');
+          version.raw = 'v' + version.version;
+        }
         version.docsUrl = 'http://code.angularjs.org/' + version.version + '/docs';
         // Versions before 1.0.2 had a different docs folder name
-        if (version.major < 1 || (version.major === 1 && version.minor === 0 && version.dot < 2)) {
+        if (version.major < 1 || (version.major === 1 && version.minor === 0 && version.patch < 2)) {
           version.docsUrl += '-' + version.version;
+          version.isOldDocsUrl = true;
         }
         return version;
       })
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
new file mode 100644
index 000000000000..965eff59e3e4
--- /dev/null
+++ b/npm-shrinkwrap.clean.json
@@ -0,0 +1,6824 @@
+{
+  "dependencies": {
+    "angular-benchpress": {
+      "version": "0.2.2",
+      "dependencies": {
+        "bootstrap": {
+          "version": "3.3.4"
+        },
+        "express": {
+          "version": "4.12.3",
+          "dependencies": {
+            "accepts": {
+              "version": "1.2.5",
+              "dependencies": {
+                "mime-types": {
+                  "version": "2.0.10",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.8.0"
+                    }
+                  }
+                },
+                "negotiator": {
+                  "version": "0.5.1"
+                }
+              }
+            },
+            "content-disposition": {
+              "version": "0.5.0"
+            },
+            "content-type": {
+              "version": "1.0.1"
+            },
+            "cookie": {
+              "version": "0.1.2"
+            },
+            "cookie-signature": {
+              "version": "1.0.6"
+            },
+            "debug": {
+              "version": "2.1.3",
+              "dependencies": {
+                "ms": {
+                  "version": "0.7.0"
+                }
+              }
+            },
+            "depd": {
+              "version": "1.0.0"
+            },
+            "escape-html": {
+              "version": "1.0.1"
+            },
+            "etag": {
+              "version": "1.5.1",
+              "dependencies": {
+                "crc": {
+                  "version": "3.2.1"
+                }
+              }
+            },
+            "finalhandler": {
+              "version": "0.3.4"
+            },
+            "fresh": {
+              "version": "0.2.4"
+            },
+            "merge-descriptors": {
+              "version": "1.0.0"
+            },
+            "methods": {
+              "version": "1.1.1"
+            },
+            "on-finished": {
+              "version": "2.2.0",
+              "dependencies": {
+                "ee-first": {
+                  "version": "1.1.0"
+                }
+              }
+            },
+            "parseurl": {
+              "version": "1.3.0"
+            },
+            "path-to-regexp": {
+              "version": "0.1.3"
+            },
+            "proxy-addr": {
+              "version": "1.0.7",
+              "dependencies": {
+                "forwarded": {
+                  "version": "0.1.0"
+                },
+                "ipaddr.js": {
+                  "version": "0.1.9"
+                }
+              }
+            },
+            "qs": {
+              "version": "2.4.1"
+            },
+            "range-parser": {
+              "version": "1.0.2"
+            },
+            "send": {
+              "version": "0.12.2",
+              "dependencies": {
+                "destroy": {
+                  "version": "1.0.3"
+                },
+                "mime": {
+                  "version": "1.3.4"
+                },
+                "ms": {
+                  "version": "0.7.0"
+                }
+              }
+            },
+            "serve-static": {
+              "version": "1.9.2"
+            },
+            "type-is": {
+              "version": "1.6.1",
+              "dependencies": {
+                "media-typer": {
+                  "version": "0.3.0"
+                },
+                "mime-types": {
+                  "version": "2.0.10",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.8.0"
+                    }
+                  }
+                }
+              }
+            },
+            "vary": {
+              "version": "1.0.0"
+            },
+            "utils-merge": {
+              "version": "1.0.0"
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.1.1"
+        },
+        "mkdirp": {
+          "version": "0.5.0",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8"
+            }
+          }
+        },
+        "rimraf": {
+          "version": "2.3.2",
+          "dependencies": {
+            "glob": {
+              "version": "4.5.3",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "minimatch": {
+                  "version": "2.0.4",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "underscore": {
+          "version": "1.8.3"
+        },
+        "di": {
+          "version": "2.0.0-pre-9",
+          "dependencies": {
+            "traceur": {
+              "version": "0.0.33",
+              "resolved": "git://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
+              "dependencies": {
+                "commander": {
+                  "version": "2.7.1",
+                  "dependencies": {
+                    "graceful-readlink": {
+                      "version": "1.0.1"
+                    }
+                  }
+                },
+                "q-io": {
+                  "version": "1.10.9",
+                  "dependencies": {
+                    "q": {
+                      "version": "0.9.7"
+                    },
+                    "qs": {
+                      "version": "0.1.0"
+                    },
+                    "url2": {
+                      "version": "0.0.0"
+                    },
+                    "mime": {
+                      "version": "1.2.11"
+                    },
+                    "mimeparse": {
+                      "version": "0.1.4"
+                    },
+                    "collections": {
+                      "version": "0.2.2",
+                      "dependencies": {
+                        "weak-map": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "es6-shim": {
+              "version": "0.9.3"
+            }
+          }
+        },
+        "rx": {
+          "version": "2.3.25"
+        },
+        "browserify": {
+          "version": "7.0.3",
+          "dependencies": {
+            "JSONStream": {
+              "version": "0.8.4",
+              "dependencies": {
+                "jsonparse": {
+                  "version": "0.0.5"
+                },
+                "through": {
+                  "version": "2.3.6"
+                }
+              }
+            },
+            "assert": {
+              "version": "1.1.2"
+            },
+            "browser-pack": {
+              "version": "3.2.0",
+              "dependencies": {
+                "combine-source-map": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "inline-source-map": {
+                      "version": "0.3.1",
+                      "dependencies": {
+                        "source-map": {
+                          "version": "0.3.0",
+                          "dependencies": {
+                            "amdefine": {
+                              "version": "0.1.0"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "convert-source-map": {
+                      "version": "0.3.5"
+                    },
+                    "source-map": {
+                      "version": "0.1.43",
+                      "dependencies": {
+                        "amdefine": {
+                          "version": "0.1.0"
+                        }
+                      }
+                    }
+                  }
+                },
+                "through2": {
+                  "version": "0.5.1"
+                }
+              }
+            },
+            "browser-resolve": {
+              "version": "1.8.2",
+              "dependencies": {
+                "resolve": {
+                  "version": "1.1.6"
+                }
+              }
+            },
+            "browserify-zlib": {
+              "version": "0.1.4",
+              "dependencies": {
+                "pako": {
+                  "version": "0.2.6"
+                }
+              }
+            },
+            "buffer": {
+              "version": "2.8.2",
+              "dependencies": {
+                "base64-js": {
+                  "version": "0.0.7"
+                },
+                "ieee754": {
+                  "version": "1.1.4"
+                },
+                "is-array": {
+                  "version": "1.0.1"
+                }
+              }
+            },
+            "builtins": {
+              "version": "0.0.7"
+            },
+            "commondir": {
+              "version": "0.0.1"
+            },
+            "concat-stream": {
+              "version": "1.4.7",
+              "dependencies": {
+                "typedarray": {
+                  "version": "0.0.6"
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "console-browserify": {
+              "version": "1.1.0",
+              "dependencies": {
+                "date-now": {
+                  "version": "0.1.4"
+                }
+              }
+            },
+            "constants-browserify": {
+              "version": "0.0.1"
+            },
+            "crypto-browserify": {
+              "version": "3.9.13",
+              "dependencies": {
+                "browserify-aes": {
+                  "version": "1.0.0"
+                },
+                "browserify-sign": {
+                  "version": "2.8.0",
+                  "dependencies": {
+                    "bn.js": {
+                      "version": "1.3.0"
+                    },
+                    "browserify-rsa": {
+                      "version": "1.1.1"
+                    },
+                    "elliptic": {
+                      "version": "1.0.1",
+                      "dependencies": {
+                        "brorand": {
+                          "version": "1.0.5"
+                        },
+                        "hash.js": {
+                          "version": "1.0.2"
+                        }
+                      }
+                    },
+                    "parse-asn1": {
+                      "version": "2.0.0",
+                      "dependencies": {
+                        "asn1.js": {
+                          "version": "1.0.3",
+                          "dependencies": {
+                            "minimalistic-assert": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        },
+                        "asn1.js-rfc3280": {
+                          "version": "1.0.0"
+                        },
+                        "pemstrip": {
+                          "version": "0.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "create-ecdh": {
+                  "version": "2.0.0",
+                  "dependencies": {
+                    "bn.js": {
+                      "version": "1.3.0"
+                    },
+                    "elliptic": {
+                      "version": "1.0.1",
+                      "dependencies": {
+                        "brorand": {
+                          "version": "1.0.5"
+                        },
+                        "hash.js": {
+                          "version": "1.0.2"
+                        }
+                      }
+                    }
+                  }
+                },
+                "create-hash": {
+                  "version": "1.1.1",
+                  "dependencies": {
+                    "ripemd160": {
+                      "version": "1.0.0"
+                    },
+                    "sha.js": {
+                      "version": "2.3.6"
+                    }
+                  }
+                },
+                "create-hmac": {
+                  "version": "1.1.3"
+                },
+                "diffie-hellman": {
+                  "version": "3.0.1",
+                  "dependencies": {
+                    "bn.js": {
+                      "version": "1.3.0"
+                    },
+                    "miller-rabin": {
+                      "version": "1.1.5",
+                      "dependencies": {
+                        "brorand": {
+                          "version": "1.0.5"
+                        }
+                      }
+                    }
+                  }
+                },
+                "pbkdf2-compat": {
+                  "version": "3.0.2"
+                },
+                "public-encrypt": {
+                  "version": "2.0.0",
+                  "dependencies": {
+                    "bn.js": {
+                      "version": "1.3.0"
+                    },
+                    "browserify-rsa": {
+                      "version": "2.0.0"
+                    },
+                    "parse-asn1": {
+                      "version": "3.0.0",
+                      "dependencies": {
+                        "asn1.js": {
+                          "version": "1.0.3",
+                          "dependencies": {
+                            "minimalistic-assert": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "randombytes": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "deep-equal": {
+              "version": "0.2.2"
+            },
+            "defined": {
+              "version": "0.0.0"
+            },
+            "deps-sort": {
+              "version": "1.3.5",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.2.0"
+                },
+                "through2": {
+                  "version": "0.5.1"
+                }
+              }
+            },
+            "domain-browser": {
+              "version": "1.1.4"
+            },
+            "duplexer2": {
+              "version": "0.0.2",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "events": {
+              "version": "1.0.2"
+            },
+            "glob": {
+              "version": "4.5.3",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1"
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.4",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "http-browserify": {
+              "version": "1.7.0",
+              "dependencies": {
+                "Base64": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "https-browserify": {
+              "version": "0.0.0"
+            },
+            "inherits": {
+              "version": "2.0.1"
+            },
+            "insert-module-globals": {
+              "version": "6.2.1",
+              "dependencies": {
+                "JSONStream": {
+                  "version": "0.7.4",
+                  "dependencies": {
+                    "jsonparse": {
+                      "version": "0.0.5"
+                    }
+                  }
+                },
+                "combine-source-map": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "inline-source-map": {
+                      "version": "0.3.1",
+                      "dependencies": {
+                        "source-map": {
+                          "version": "0.3.0",
+                          "dependencies": {
+                            "amdefine": {
+                              "version": "0.1.0"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "convert-source-map": {
+                      "version": "0.3.5"
+                    },
+                    "source-map": {
+                      "version": "0.1.43",
+                      "dependencies": {
+                        "amdefine": {
+                          "version": "0.1.0"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lexical-scope": {
+                  "version": "1.1.0",
+                  "dependencies": {
+                    "astw": {
+                      "version": "1.1.0",
+                      "dependencies": {
+                        "esprima-fb": {
+                          "version": "3001.1.0-dev-harmony-fb"
+                        }
+                      }
+                    }
+                  }
+                },
+                "process": {
+                  "version": "0.6.0"
+                },
+                "through": {
+                  "version": "2.3.6"
+                }
+              }
+            },
+            "isarray": {
+              "version": "0.0.1"
+            },
+            "labeled-stream-splicer": {
+              "version": "1.0.2",
+              "dependencies": {
+                "stream-splicer": {
+                  "version": "1.3.1",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    },
+                    "readable-wrap": {
+                      "version": "1.0.0"
+                    },
+                    "indexof": {
+                      "version": "0.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "module-deps": {
+              "version": "3.7.5",
+              "dependencies": {
+                "JSONStream": {
+                  "version": "0.7.4",
+                  "dependencies": {
+                    "jsonparse": {
+                      "version": "0.0.5"
+                    },
+                    "through": {
+                      "version": "2.3.6"
+                    }
+                  }
+                },
+                "detective": {
+                  "version": "4.0.0",
+                  "dependencies": {
+                    "acorn": {
+                      "version": "0.9.0"
+                    },
+                    "escodegen": {
+                      "version": "1.6.1",
+                      "dependencies": {
+                        "estraverse": {
+                          "version": "1.9.3"
+                        },
+                        "esutils": {
+                          "version": "1.1.6"
+                        },
+                        "esprima": {
+                          "version": "1.2.5"
+                        },
+                        "optionator": {
+                          "version": "0.5.0",
+                          "dependencies": {
+                            "prelude-ls": {
+                              "version": "1.1.1"
+                            },
+                            "deep-is": {
+                              "version": "0.1.3"
+                            },
+                            "wordwrap": {
+                              "version": "0.0.2"
+                            },
+                            "type-check": {
+                              "version": "0.3.1"
+                            },
+                            "levn": {
+                              "version": "0.2.5"
+                            },
+                            "fast-levenshtein": {
+                              "version": "1.0.6"
+                            }
+                          }
+                        },
+                        "source-map": {
+                          "version": "0.1.43",
+                          "dependencies": {
+                            "amdefine": {
+                              "version": "0.1.0"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimist": {
+                  "version": "0.2.0"
+                },
+                "parents": {
+                  "version": "1.0.1",
+                  "dependencies": {
+                    "path-platform": {
+                      "version": "0.11.15"
+                    }
+                  }
+                },
+                "resolve": {
+                  "version": "1.1.6"
+                },
+                "stream-combiner2": {
+                  "version": "1.0.2",
+                  "dependencies": {
+                    "through2": {
+                      "version": "0.5.1",
+                      "dependencies": {
+                        "xtend": {
+                          "version": "3.0.0"
+                        }
+                      }
+                    }
+                  }
+                },
+                "subarg": {
+                  "version": "0.0.1",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.10"
+                    }
+                  }
+                },
+                "through2": {
+                  "version": "0.4.2",
+                  "dependencies": {
+                    "xtend": {
+                      "version": "2.1.2",
+                      "dependencies": {
+                        "object-keys": {
+                          "version": "0.4.0"
+                        }
+                      }
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0"
+                }
+              }
+            },
+            "os-browserify": {
+              "version": "0.1.2"
+            },
+            "parents": {
+              "version": "0.0.3",
+              "dependencies": {
+                "path-platform": {
+                  "version": "0.0.1"
+                }
+              }
+            },
+            "path-browserify": {
+              "version": "0.0.0"
+            },
+            "process": {
+              "version": "0.8.0"
+            },
+            "punycode": {
+              "version": "1.2.4"
+            },
+            "querystring-es3": {
+              "version": "0.2.1"
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                }
+              }
+            },
+            "resolve": {
+              "version": "0.7.4"
+            },
+            "shallow-copy": {
+              "version": "0.0.1"
+            },
+            "shasum": {
+              "version": "1.0.1",
+              "dependencies": {
+                "json-stable-stringify": {
+                  "version": "0.0.1",
+                  "dependencies": {
+                    "jsonify": {
+                      "version": "0.0.0"
+                    }
+                  }
+                },
+                "sha.js": {
+                  "version": "2.3.6"
+                }
+              }
+            },
+            "shell-quote": {
+              "version": "0.0.1"
+            },
+            "stream-browserify": {
+              "version": "1.0.0"
+            },
+            "string_decoder": {
+              "version": "0.10.31"
+            },
+            "subarg": {
+              "version": "1.0.0"
+            },
+            "syntax-error": {
+              "version": "1.1.2",
+              "dependencies": {
+                "acorn": {
+                  "version": "0.9.0"
+                }
+              }
+            },
+            "through2": {
+              "version": "1.1.1",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0"
+                }
+              }
+            },
+            "timers-browserify": {
+              "version": "1.4.0",
+              "dependencies": {
+                "process": {
+                  "version": "0.10.1"
+                }
+              }
+            },
+            "tty-browserify": {
+              "version": "0.0.0"
+            },
+            "umd": {
+              "version": "2.1.0",
+              "dependencies": {
+                "rfile": {
+                  "version": "1.0.0",
+                  "dependencies": {
+                    "callsite": {
+                      "version": "1.0.0"
+                    },
+                    "resolve": {
+                      "version": "0.3.1"
+                    }
+                  }
+                },
+                "ruglify": {
+                  "version": "1.0.0",
+                  "dependencies": {
+                    "uglify-js": {
+                      "version": "2.2.5",
+                      "dependencies": {
+                        "source-map": {
+                          "version": "0.1.43",
+                          "dependencies": {
+                            "amdefine": {
+                              "version": "0.1.0"
+                            }
+                          }
+                        },
+                        "optimist": {
+                          "version": "0.3.7",
+                          "dependencies": {
+                            "wordwrap": {
+                              "version": "0.0.2"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "through": {
+                  "version": "2.3.6"
+                },
+                "uglify-js": {
+                  "version": "2.4.19",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.2.10"
+                    },
+                    "source-map": {
+                      "version": "0.1.34",
+                      "dependencies": {
+                        "amdefine": {
+                          "version": "0.1.0"
+                        }
+                      }
+                    },
+                    "yargs": {
+                      "version": "3.5.4",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.0.2"
+                        },
+                        "decamelize": {
+                          "version": "1.0.0"
+                        },
+                        "window-size": {
+                          "version": "0.1.0"
+                        },
+                        "wordwrap": {
+                          "version": "0.0.2"
+                        }
+                      }
+                    },
+                    "uglify-to-browserify": {
+                      "version": "1.0.2"
+                    }
+                  }
+                }
+              }
+            },
+            "url": {
+              "version": "0.10.3",
+              "dependencies": {
+                "punycode": {
+                  "version": "1.3.2"
+                },
+                "querystring": {
+                  "version": "0.2.0"
+                }
+              }
+            },
+            "util": {
+              "version": "0.10.3"
+            },
+            "vm-browserify": {
+              "version": "0.0.4",
+              "dependencies": {
+                "indexof": {
+                  "version": "0.0.1"
+                }
+              }
+            },
+            "xtend": {
+              "version": "3.0.0"
+            }
+          }
+        }
+      }
+    },
+    "benchmark": {
+      "version": "1.0.0"
+    },
+    "bower": {
+      "version": "1.3.12",
+      "dependencies": {
+        "abbrev": {
+          "version": "1.0.5"
+        },
+        "archy": {
+          "version": "0.0.2"
+        },
+        "bower-config": {
+          "version": "0.5.2",
+          "dependencies": {
+            "graceful-fs": {
+              "version": "2.0.3"
+            },
+            "optimist": {
+              "version": "0.6.1",
+              "dependencies": {
+                "wordwrap": {
+                  "version": "0.0.2"
+                },
+                "minimist": {
+                  "version": "0.0.10"
+                }
+              }
+            },
+            "osenv": {
+              "version": "0.0.3"
+            }
+          }
+        },
+        "bower-endpoint-parser": {
+          "version": "0.2.2"
+        },
+        "bower-json": {
+          "version": "0.4.0",
+          "dependencies": {
+            "deep-extend": {
+              "version": "0.2.11"
+            },
+            "graceful-fs": {
+              "version": "2.0.3"
+            },
+            "intersect": {
+              "version": "0.0.3"
+            }
+          }
+        },
+        "bower-logger": {
+          "version": "0.2.2"
+        },
+        "bower-registry-client": {
+          "version": "0.2.4",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10"
+            },
+            "graceful-fs": {
+              "version": "2.0.3"
+            },
+            "lru-cache": {
+              "version": "2.3.1"
+            },
+            "request": {
+              "version": "2.51.0",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1"
+                        },
+                        "isarray": {
+                          "version": "0.0.1"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.8.0"
+                },
+                "forever-agent": {
+                  "version": "0.5.2"
+                },
+                "form-data": {
+                  "version": "0.2.0",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.9.0"
+                    },
+                    "mime-types": {
+                      "version": "2.0.10",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.8.0"
+                        }
+                      }
+                    }
+                  }
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.0"
+                },
+                "mime-types": {
+                  "version": "1.0.2"
+                },
+                "node-uuid": {
+                  "version": "1.4.3"
+                },
+                "qs": {
+                  "version": "2.3.3"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.0"
+                },
+                "tough-cookie": {
+                  "version": "0.12.1",
+                  "dependencies": {
+                    "punycode": {
+                      "version": "1.3.2"
+                    }
+                  }
+                },
+                "http-signature": {
+                  "version": "0.10.1",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5"
+                    },
+                    "asn1": {
+                      "version": "0.1.11"
+                    },
+                    "ctype": {
+                      "version": "0.5.3"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.5.0"
+                },
+                "hawk": {
+                  "version": "1.1.1",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1"
+                    },
+                    "boom": {
+                      "version": "0.4.2"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2"
+                    },
+                    "sntp": {
+                      "version": "0.2.4"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0"
+                },
+                "stringstream": {
+                  "version": "0.0.4"
+                },
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5"
+                    }
+                  }
+                }
+              }
+            },
+            "request-replay": {
+              "version": "0.2.0"
+            },
+            "mkdirp": {
+              "version": "0.3.5"
+            }
+          }
+        },
+        "cardinal": {
+          "version": "0.4.0",
+          "dependencies": {
+            "redeyed": {
+              "version": "0.4.4",
+              "dependencies": {
+                "esprima": {
+                  "version": "1.0.4"
+                }
+              }
+            }
+          }
+        },
+        "chalk": {
+          "version": "0.5.0",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0"
+            }
+          }
+        },
+        "chmodr": {
+          "version": "0.1.0"
+        },
+        "decompress-zip": {
+          "version": "0.0.8",
+          "dependencies": {
+            "mkpath": {
+              "version": "0.1.0"
+            },
+            "binary": {
+              "version": "0.3.0",
+              "dependencies": {
+                "chainsaw": {
+                  "version": "0.1.0",
+                  "dependencies": {
+                    "traverse": {
+                      "version": "0.3.9"
+                    }
+                  }
+                },
+                "buffers": {
+                  "version": "0.1.1"
+                }
+              }
+            },
+            "touch": {
+              "version": "0.0.2",
+              "dependencies": {
+                "nopt": {
+                  "version": "1.0.10"
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "nopt": {
+              "version": "2.2.1"
+            }
+          }
+        },
+        "fstream": {
+          "version": "1.0.4",
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.1"
+            }
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.2",
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.1"
+            },
+            "minimatch": {
+              "version": "2.0.4",
+              "dependencies": {
+                "brace-expansion": {
+                  "version": "1.1.0",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.2.0"
+                    },
+                    "concat-map": {
+                      "version": "0.0.1"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "glob": {
+          "version": "4.0.6",
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.1"
+            },
+            "minimatch": {
+              "version": "1.0.0",
+              "dependencies": {
+                "sigmund": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "once": {
+              "version": "1.3.1",
+              "dependencies": {
+                "wrappy": {
+                  "version": "1.0.1"
+                }
+              }
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "3.0.6"
+        },
+        "handlebars": {
+          "version": "2.0.0",
+          "dependencies": {
+            "optimist": {
+              "version": "0.3.7",
+              "dependencies": {
+                "wordwrap": {
+                  "version": "0.0.2"
+                }
+              }
+            },
+            "uglify-js": {
+              "version": "2.3.6",
+              "dependencies": {
+                "async": {
+                  "version": "0.2.10"
+                },
+                "source-map": {
+                  "version": "0.1.43",
+                  "dependencies": {
+                    "amdefine": {
+                      "version": "0.1.0"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "inquirer": {
+          "version": "0.7.1",
+          "dependencies": {
+            "cli-color": {
+              "version": "0.3.3",
+              "dependencies": {
+                "d": {
+                  "version": "0.1.1"
+                },
+                "es5-ext": {
+                  "version": "0.10.6",
+                  "dependencies": {
+                    "es6-iterator": {
+                      "version": "0.1.3"
+                    },
+                    "es6-symbol": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "memoizee": {
+                  "version": "0.3.8",
+                  "dependencies": {
+                    "es6-weak-map": {
+                      "version": "0.1.2",
+                      "dependencies": {
+                        "es6-iterator": {
+                          "version": "0.1.3",
+                          "dependencies": {
+                            "es6-symbol": {
+                              "version": "2.0.1"
+                            }
+                          }
+                        },
+                        "es6-symbol": {
+                          "version": "0.1.1"
+                        }
+                      }
+                    },
+                    "event-emitter": {
+                      "version": "0.3.3"
+                    },
+                    "lru-queue": {
+                      "version": "0.1.0"
+                    },
+                    "next-tick": {
+                      "version": "0.2.2"
+                    }
+                  }
+                },
+                "timers-ext": {
+                  "version": "0.1.0",
+                  "dependencies": {
+                    "next-tick": {
+                      "version": "0.2.2"
+                    }
+                  }
+                }
+              }
+            },
+            "figures": {
+              "version": "1.3.5"
+            },
+            "mute-stream": {
+              "version": "0.0.4"
+            },
+            "readline2": {
+              "version": "0.1.1",
+              "dependencies": {
+                "strip-ansi": {
+                  "version": "2.0.1",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "1.1.1"
+                    }
+                  }
+                }
+              }
+            },
+            "rx": {
+              "version": "2.4.9"
+            },
+            "through": {
+              "version": "2.3.6"
+            }
+          }
+        },
+        "insight": {
+          "version": "0.4.3",
+          "dependencies": {
+            "async": {
+              "version": "0.9.0"
+            },
+            "chalk": {
+              "version": "0.5.1",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "1.1.0"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3"
+                },
+                "has-ansi": {
+                  "version": "0.1.0",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.2.1"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.2.1"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "0.2.0"
+                }
+              }
+            },
+            "configstore": {
+              "version": "0.3.2",
+              "dependencies": {
+                "js-yaml": {
+                  "version": "3.2.7",
+                  "dependencies": {
+                    "argparse": {
+                      "version": "1.0.2",
+                      "dependencies": {
+                        "lodash": {
+                          "version": "3.6.0"
+                        },
+                        "sprintf-js": {
+                          "version": "1.0.2"
+                        }
+                      }
+                    },
+                    "esprima": {
+                      "version": "2.0.0"
+                    }
+                  }
+                },
+                "object-assign": {
+                  "version": "2.0.0"
+                },
+                "user-home": {
+                  "version": "1.1.1"
+                },
+                "uuid": {
+                  "version": "2.0.1"
+                },
+                "xdg-basedir": {
+                  "version": "1.0.1"
+                }
+              }
+            },
+            "inquirer": {
+              "version": "0.6.0",
+              "dependencies": {
+                "cli-color": {
+                  "version": "0.3.3",
+                  "dependencies": {
+                    "d": {
+                      "version": "0.1.1"
+                    },
+                    "es5-ext": {
+                      "version": "0.10.6",
+                      "dependencies": {
+                        "es6-iterator": {
+                          "version": "0.1.3"
+                        },
+                        "es6-symbol": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    },
+                    "memoizee": {
+                      "version": "0.3.8",
+                      "dependencies": {
+                        "es6-weak-map": {
+                          "version": "0.1.2",
+                          "dependencies": {
+                            "es6-iterator": {
+                              "version": "0.1.3",
+                              "dependencies": {
+                                "es6-symbol": {
+                                  "version": "2.0.1"
+                                }
+                              }
+                            },
+                            "es6-symbol": {
+                              "version": "0.1.1"
+                            }
+                          }
+                        },
+                        "event-emitter": {
+                          "version": "0.3.3"
+                        },
+                        "lru-queue": {
+                          "version": "0.1.0"
+                        },
+                        "next-tick": {
+                          "version": "0.2.2"
+                        }
+                      }
+                    },
+                    "timers-ext": {
+                      "version": "0.1.0",
+                      "dependencies": {
+                        "next-tick": {
+                          "version": "0.2.2"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mute-stream": {
+                  "version": "0.0.4"
+                },
+                "readline2": {
+                  "version": "0.1.1",
+                  "dependencies": {
+                    "strip-ansi": {
+                      "version": "2.0.1",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "1.1.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "rx": {
+                  "version": "2.4.9"
+                },
+                "through": {
+                  "version": "2.3.6"
+                }
+              }
+            },
+            "lodash.debounce": {
+              "version": "2.4.1",
+              "dependencies": {
+                "lodash.isfunction": {
+                  "version": "2.4.1"
+                },
+                "lodash.isobject": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._objecttypes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash.now": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1"
+                    }
+                  }
+                }
+              }
+            },
+            "object-assign": {
+              "version": "1.0.0"
+            },
+            "os-name": {
+              "version": "1.0.3",
+              "dependencies": {
+                "osx-release": {
+                  "version": "1.0.0",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "1.1.1"
+                    }
+                  }
+                },
+                "win-release": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "tough-cookie": {
+              "version": "0.12.1",
+              "dependencies": {
+                "punycode": {
+                  "version": "1.3.2"
+                }
+              }
+            }
+          }
+        },
+        "is-root": {
+          "version": "1.0.0"
+        },
+        "junk": {
+          "version": "1.0.1"
+        },
+        "lockfile": {
+          "version": "1.0.0"
+        },
+        "lru-cache": {
+          "version": "2.5.0"
+        },
+        "mkdirp": {
+          "version": "0.5.0",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8"
+            }
+          }
+        },
+        "mout": {
+          "version": "0.9.1"
+        },
+        "nopt": {
+          "version": "3.0.1"
+        },
+        "opn": {
+          "version": "1.0.1"
+        },
+        "osenv": {
+          "version": "0.1.0"
+        },
+        "p-throttler": {
+          "version": "0.1.0",
+          "dependencies": {
+            "q": {
+              "version": "0.9.7"
+            }
+          }
+        },
+        "promptly": {
+          "version": "0.2.0",
+          "dependencies": {
+            "read": {
+              "version": "1.0.5",
+              "dependencies": {
+                "mute-stream": {
+                  "version": "0.0.4"
+                }
+              }
+            }
+          }
+        },
+        "request": {
+          "version": "2.42.0",
+          "dependencies": {
+            "bl": {
+              "version": "0.9.4",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "caseless": {
+              "version": "0.6.0"
+            },
+            "forever-agent": {
+              "version": "0.5.2"
+            },
+            "qs": {
+              "version": "1.2.2"
+            },
+            "json-stringify-safe": {
+              "version": "5.0.0"
+            },
+            "mime-types": {
+              "version": "1.0.2"
+            },
+            "node-uuid": {
+              "version": "1.4.3"
+            },
+            "tunnel-agent": {
+              "version": "0.4.0"
+            },
+            "tough-cookie": {
+              "version": "0.12.1",
+              "dependencies": {
+                "punycode": {
+                  "version": "1.3.2"
+                }
+              }
+            },
+            "form-data": {
+              "version": "0.1.4",
+              "dependencies": {
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5"
+                    }
+                  }
+                },
+                "mime": {
+                  "version": "1.2.11"
+                },
+                "async": {
+                  "version": "0.9.0"
+                }
+              }
+            },
+            "http-signature": {
+              "version": "0.10.1",
+              "dependencies": {
+                "assert-plus": {
+                  "version": "0.1.5"
+                },
+                "asn1": {
+                  "version": "0.1.11"
+                },
+                "ctype": {
+                  "version": "0.5.3"
+                }
+              }
+            },
+            "oauth-sign": {
+              "version": "0.4.0"
+            },
+            "hawk": {
+              "version": "1.1.1",
+              "dependencies": {
+                "hoek": {
+                  "version": "0.9.1"
+                },
+                "boom": {
+                  "version": "0.4.2"
+                },
+                "cryptiles": {
+                  "version": "0.2.2"
+                },
+                "sntp": {
+                  "version": "0.2.4"
+                }
+              }
+            },
+            "aws-sign2": {
+              "version": "0.5.0"
+            },
+            "stringstream": {
+              "version": "0.0.4"
+            }
+          }
+        },
+        "request-progress": {
+          "version": "0.3.0",
+          "dependencies": {
+            "throttleit": {
+              "version": "0.0.2"
+            }
+          }
+        },
+        "retry": {
+          "version": "0.6.0"
+        },
+        "rimraf": {
+          "version": "2.2.8"
+        },
+        "semver": {
+          "version": "2.3.2"
+        },
+        "shell-quote": {
+          "version": "1.4.3",
+          "dependencies": {
+            "jsonify": {
+              "version": "0.0.0"
+            },
+            "array-filter": {
+              "version": "0.0.1"
+            },
+            "array-reduce": {
+              "version": "0.0.0"
+            },
+            "array-map": {
+              "version": "0.0.0"
+            }
+          }
+        },
+        "stringify-object": {
+          "version": "1.0.1"
+        },
+        "tar-fs": {
+          "version": "0.5.2",
+          "dependencies": {
+            "pump": {
+              "version": "0.3.5",
+              "dependencies": {
+                "once": {
+                  "version": "1.2.0"
+                },
+                "end-of-stream": {
+                  "version": "1.0.0",
+                  "dependencies": {
+                    "once": {
+                      "version": "1.3.1",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "tar-stream": {
+              "version": "0.4.7",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4"
+                },
+                "end-of-stream": {
+                  "version": "1.1.0",
+                  "dependencies": {
+                    "once": {
+                      "version": "1.3.1",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0"
+                }
+              }
+            }
+          }
+        },
+        "tmp": {
+          "version": "0.0.23"
+        },
+        "update-notifier": {
+          "version": "0.2.0",
+          "dependencies": {
+            "configstore": {
+              "version": "0.3.2",
+              "dependencies": {
+                "js-yaml": {
+                  "version": "3.2.7",
+                  "dependencies": {
+                    "argparse": {
+                      "version": "1.0.2",
+                      "dependencies": {
+                        "lodash": {
+                          "version": "3.6.0"
+                        },
+                        "sprintf-js": {
+                          "version": "1.0.2"
+                        }
+                      }
+                    },
+                    "esprima": {
+                      "version": "2.0.0"
+                    }
+                  }
+                },
+                "object-assign": {
+                  "version": "2.0.0"
+                },
+                "user-home": {
+                  "version": "1.1.1"
+                },
+                "uuid": {
+                  "version": "2.0.1"
+                },
+                "xdg-basedir": {
+                  "version": "1.0.1"
+                }
+              }
+            },
+            "latest-version": {
+              "version": "0.2.0",
+              "dependencies": {
+                "package-json": {
+                  "version": "0.2.0",
+                  "dependencies": {
+                    "got": {
+                      "version": "0.3.0",
+                      "dependencies": {
+                        "object-assign": {
+                          "version": "0.3.1"
+                        }
+                      }
+                    },
+                    "registry-url": {
+                      "version": "0.1.1",
+                      "dependencies": {
+                        "npmconf": {
+                          "version": "2.1.1",
+                          "dependencies": {
+                            "config-chain": {
+                              "version": "1.1.8",
+                              "dependencies": {
+                                "proto-list": {
+                                  "version": "1.2.3"
+                                }
+                              }
+                            },
+                            "inherits": {
+                              "version": "2.0.1"
+                            },
+                            "ini": {
+                              "version": "1.3.3"
+                            },
+                            "once": {
+                              "version": "1.3.1",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1"
+                                }
+                              }
+                            },
+                            "uid-number": {
+                              "version": "0.0.5"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "semver-diff": {
+              "version": "0.1.0"
+            },
+            "string-length": {
+              "version": "0.1.2",
+              "dependencies": {
+                "strip-ansi": {
+                  "version": "0.2.2",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.1.0"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "which": {
+          "version": "1.0.9"
+        }
+      }
+    },
+    "browserstacktunnel-wrapper": {
+      "version": "1.3.1",
+      "dependencies": {
+        "unzip": {
+          "version": "0.1.11",
+          "dependencies": {
+            "fstream": {
+              "version": "0.1.31",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.6"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "mkdirp": {
+                  "version": "0.5.0",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8"
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.3.2",
+                  "dependencies": {
+                    "glob": {
+                      "version": "4.5.3",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "2.0.4",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.0",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.2.0"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.1",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "pullstream": {
+              "version": "0.4.1",
+              "dependencies": {
+                "over": {
+                  "version": "0.0.5"
+                },
+                "slice-stream": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "binary": {
+              "version": "0.3.0",
+              "dependencies": {
+                "chainsaw": {
+                  "version": "0.1.0",
+                  "dependencies": {
+                    "traverse": {
+                      "version": "0.3.9"
+                    }
+                  }
+                },
+                "buffers": {
+                  "version": "0.1.1"
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "setimmediate": {
+              "version": "1.0.2"
+            },
+            "match-stream": {
+              "version": "0.0.2",
+              "dependencies": {
+                "buffers": {
+                  "version": "0.1.1"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "canonical-path": {
+      "version": "0.0.2"
+    },
+    "cheerio": {
+      "version": "0.17.0",
+      "dependencies": {
+        "CSSselect": {
+          "version": "0.4.1",
+          "dependencies": {
+            "CSSwhat": {
+              "version": "0.4.7"
+            },
+            "domutils": {
+              "version": "1.4.3",
+              "dependencies": {
+                "domelementtype": {
+                  "version": "1.3.0"
+                }
+              }
+            }
+          }
+        },
+        "entities": {
+          "version": "1.1.1"
+        },
+        "htmlparser2": {
+          "version": "3.7.3",
+          "dependencies": {
+            "domhandler": {
+              "version": "2.2.1"
+            },
+            "domutils": {
+              "version": "1.5.1"
+            },
+            "domelementtype": {
+              "version": "1.3.0"
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "entities": {
+              "version": "1.0.0"
+            }
+          }
+        },
+        "dom-serializer": {
+          "version": "0.0.1",
+          "dependencies": {
+            "domelementtype": {
+              "version": "1.1.3"
+            }
+          }
+        }
+      }
+    },
+    "dgeni": {
+      "version": "0.4.1",
+      "dependencies": {
+        "dependency-graph": {
+          "version": "0.1.0",
+          "dependencies": {
+            "underscore": {
+              "version": "1.4.4"
+            }
+          }
+        },
+        "di": {
+          "version": "0.0.1"
+        },
+        "optimist": {
+          "version": "0.6.1",
+          "dependencies": {
+            "wordwrap": {
+              "version": "0.0.2"
+            },
+            "minimist": {
+              "version": "0.0.10"
+            }
+          }
+        },
+        "q": {
+          "version": "0.9.7"
+        },
+        "validate.js": {
+          "version": "0.2.0"
+        },
+        "winston": {
+          "version": "0.7.3",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10"
+            },
+            "colors": {
+              "version": "0.6.2"
+            },
+            "cycle": {
+              "version": "1.0.3"
+            },
+            "eyes": {
+              "version": "0.1.8"
+            },
+            "pkginfo": {
+              "version": "0.3.0"
+            },
+            "request": {
+              "version": "2.16.6",
+              "dependencies": {
+                "form-data": {
+                  "version": "0.0.10",
+                  "dependencies": {
+                    "combined-stream": {
+                      "version": "0.0.7",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "0.0.5"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mime": {
+                  "version": "1.2.11"
+                },
+                "hawk": {
+                  "version": "0.10.2",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.7.6"
+                    },
+                    "boom": {
+                      "version": "0.3.8"
+                    },
+                    "cryptiles": {
+                      "version": "0.1.3"
+                    },
+                    "sntp": {
+                      "version": "0.1.4"
+                    }
+                  }
+                },
+                "node-uuid": {
+                  "version": "1.4.3"
+                },
+                "cookie-jar": {
+                  "version": "0.2.0"
+                },
+                "aws-sign": {
+                  "version": "0.2.0"
+                },
+                "oauth-sign": {
+                  "version": "0.2.0"
+                },
+                "forever-agent": {
+                  "version": "0.2.0"
+                },
+                "tunnel-agent": {
+                  "version": "0.2.0"
+                },
+                "json-stringify-safe": {
+                  "version": "3.0.0"
+                },
+                "qs": {
+                  "version": "0.5.6"
+                }
+              }
+            },
+            "stack-trace": {
+              "version": "0.0.9"
+            }
+          }
+        }
+      }
+    },
+    "dgeni-packages": {
+      "version": "0.10.17",
+      "dependencies": {
+        "catharsis": {
+          "version": "0.8.7",
+          "dependencies": {
+            "underscore-contrib": {
+              "version": "0.3.0",
+              "dependencies": {
+                "underscore": {
+                  "version": "1.6.0"
+                }
+              }
+            }
+          }
+        },
+        "change-case": {
+          "version": "2.3.0",
+          "dependencies": {
+            "camel-case": {
+              "version": "1.1.2"
+            },
+            "constant-case": {
+              "version": "1.1.1"
+            },
+            "dot-case": {
+              "version": "1.1.1"
+            },
+            "is-lower-case": {
+              "version": "1.1.1"
+            },
+            "is-upper-case": {
+              "version": "1.1.1"
+            },
+            "lower-case": {
+              "version": "1.1.2"
+            },
+            "lower-case-first": {
+              "version": "1.0.0"
+            },
+            "param-case": {
+              "version": "1.1.1"
+            },
+            "pascal-case": {
+              "version": "1.1.1"
+            },
+            "path-case": {
+              "version": "1.1.1"
+            },
+            "sentence-case": {
+              "version": "1.1.2"
+            },
+            "snake-case": {
+              "version": "1.1.1"
+            },
+            "swap-case": {
+              "version": "1.1.1"
+            },
+            "title-case": {
+              "version": "1.1.1"
+            },
+            "upper-case": {
+              "version": "1.1.2"
+            },
+            "upper-case-first": {
+              "version": "1.1.1"
+            }
+          }
+        },
+        "esprima": {
+          "version": "1.2.5"
+        },
+        "estraverse": {
+          "version": "1.9.3"
+        },
+        "glob": {
+          "version": "3.2.11",
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.1"
+            }
+          }
+        },
+        "htmlparser2": {
+          "version": "3.8.3",
+          "dependencies": {
+            "domhandler": {
+              "version": "2.3.0"
+            },
+            "domutils": {
+              "version": "1.5.1",
+              "dependencies": {
+                "dom-serializer": {
+                  "version": "0.1.0",
+                  "dependencies": {
+                    "domelementtype": {
+                      "version": "1.1.3"
+                    },
+                    "entities": {
+                      "version": "1.1.1"
+                    }
+                  }
+                }
+              }
+            },
+            "domelementtype": {
+              "version": "1.3.0"
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "entities": {
+              "version": "1.0.0"
+            }
+          }
+        },
+        "minimatch": {
+          "version": "0.3.0",
+          "dependencies": {
+            "lru-cache": {
+              "version": "2.6.4"
+            },
+            "sigmund": {
+              "version": "1.0.1"
+            }
+          }
+        },
+        "nunjucks": {
+          "version": "1.3.4",
+          "dependencies": {
+            "optimist": {
+              "version": "0.6.1",
+              "dependencies": {
+                "wordwrap": {
+                  "version": "0.0.3"
+                },
+                "minimist": {
+                  "version": "0.0.10"
+                }
+              }
+            },
+            "chokidar": {
+              "version": "0.12.6",
+              "dependencies": {
+                "readdirp": {
+                  "version": "1.3.0",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "2.0.3"
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.6.4"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    },
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1"
+                        },
+                        "isarray": {
+                          "version": "0.0.1"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "async-each": {
+                  "version": "0.1.6"
+                },
+                "fsevents": {
+                  "version": "0.3.6",
+                  "dependencies": {
+                    "nan": {
+                      "version": "1.8.4"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "q-io": {
+          "version": "1.10.9",
+          "dependencies": {
+            "q": {
+              "version": "0.9.7"
+            },
+            "qs": {
+              "version": "0.1.0"
+            },
+            "url2": {
+              "version": "0.0.0"
+            },
+            "mime": {
+              "version": "1.2.11"
+            },
+            "mimeparse": {
+              "version": "0.1.4"
+            },
+            "collections": {
+              "version": "0.2.2",
+              "dependencies": {
+                "weak-map": {
+                  "version": "1.0.0"
+                }
+              }
+            }
+          }
+        },
+        "semver": {
+          "version": "4.3.6"
+        },
+        "shelljs": {
+          "version": "0.5.1"
+        },
+        "winston": {
+          "version": "0.7.3",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10"
+            },
+            "colors": {
+              "version": "0.6.2"
+            },
+            "cycle": {
+              "version": "1.0.3"
+            },
+            "eyes": {
+              "version": "0.1.8"
+            },
+            "pkginfo": {
+              "version": "0.3.0"
+            },
+            "request": {
+              "version": "2.16.6",
+              "dependencies": {
+                "form-data": {
+                  "version": "0.0.10",
+                  "dependencies": {
+                    "combined-stream": {
+                      "version": "0.0.7",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "0.0.5"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mime": {
+                  "version": "1.2.11"
+                },
+                "hawk": {
+                  "version": "0.10.2",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.7.6"
+                    },
+                    "boom": {
+                      "version": "0.3.8"
+                    },
+                    "cryptiles": {
+                      "version": "0.1.3"
+                    },
+                    "sntp": {
+                      "version": "0.1.4"
+                    }
+                  }
+                },
+                "node-uuid": {
+                  "version": "1.4.3"
+                },
+                "cookie-jar": {
+                  "version": "0.2.0"
+                },
+                "aws-sign": {
+                  "version": "0.2.0"
+                },
+                "oauth-sign": {
+                  "version": "0.2.0"
+                },
+                "forever-agent": {
+                  "version": "0.2.0"
+                },
+                "tunnel-agent": {
+                  "version": "0.2.0"
+                },
+                "json-stringify-safe": {
+                  "version": "3.0.0"
+                },
+                "qs": {
+                  "version": "0.5.6"
+                }
+              }
+            },
+            "stack-trace": {
+              "version": "0.0.9"
+            }
+          }
+        }
+      }
+    },
+    "event-stream": {
+      "version": "3.1.7",
+      "dependencies": {
+        "through": {
+          "version": "2.3.6"
+        },
+        "duplexer": {
+          "version": "0.1.1"
+        },
+        "from": {
+          "version": "0.1.3"
+        },
+        "map-stream": {
+          "version": "0.1.0"
+        },
+        "pause-stream": {
+          "version": "0.0.11"
+        },
+        "split": {
+          "version": "0.2.10"
+        },
+        "stream-combiner": {
+          "version": "0.0.4"
+        }
+      }
+    },
+    "grunt": {
+      "version": "0.4.5",
+      "dependencies": {
+        "async": {
+          "version": "0.1.22"
+        },
+        "coffee-script": {
+          "version": "1.3.3"
+        },
+        "colors": {
+          "version": "0.6.2"
+        },
+        "dateformat": {
+          "version": "1.0.2-1.2.3"
+        },
+        "eventemitter2": {
+          "version": "0.4.14"
+        },
+        "findup-sync": {
+          "version": "0.1.3",
+          "dependencies": {
+            "glob": {
+              "version": "3.2.11",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "minimatch": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.5.0"
+                    },
+                    "sigmund": {
+                      "version": "1.0.0"
+                    }
+                  }
+                }
+              }
+            },
+            "lodash": {
+              "version": "2.4.1"
+            }
+          }
+        },
+        "glob": {
+          "version": "3.1.21",
+          "dependencies": {
+            "graceful-fs": {
+              "version": "1.2.3"
+            },
+            "inherits": {
+              "version": "1.0.0"
+            }
+          }
+        },
+        "hooker": {
+          "version": "0.2.3"
+        },
+        "iconv-lite": {
+          "version": "0.2.11"
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "dependencies": {
+            "lru-cache": {
+              "version": "2.5.0"
+            },
+            "sigmund": {
+              "version": "1.0.0"
+            }
+          }
+        },
+        "nopt": {
+          "version": "1.0.10",
+          "dependencies": {
+            "abbrev": {
+              "version": "1.0.5"
+            }
+          }
+        },
+        "rimraf": {
+          "version": "2.2.8"
+        },
+        "lodash": {
+          "version": "0.9.2"
+        },
+        "underscore.string": {
+          "version": "2.2.1"
+        },
+        "which": {
+          "version": "1.0.9"
+        },
+        "js-yaml": {
+          "version": "2.0.5",
+          "dependencies": {
+            "argparse": {
+              "version": "0.1.16",
+              "dependencies": {
+                "underscore": {
+                  "version": "1.7.0"
+                },
+                "underscore.string": {
+                  "version": "2.4.0"
+                }
+              }
+            },
+            "esprima": {
+              "version": "1.0.4"
+            }
+          }
+        },
+        "exit": {
+          "version": "0.1.2"
+        },
+        "getobject": {
+          "version": "0.1.0"
+        },
+        "grunt-legacy-util": {
+          "version": "0.2.0"
+        },
+        "grunt-legacy-log": {
+          "version": "0.1.1",
+          "dependencies": {
+            "lodash": {
+              "version": "2.4.1"
+            },
+            "underscore.string": {
+              "version": "2.3.3"
+            }
+          }
+        }
+      }
+    },
+    "grunt-bump": {
+      "version": "0.0.17",
+      "dependencies": {
+        "semver": {
+          "version": "2.3.2"
+        }
+      }
+    },
+    "grunt-contrib-clean": {
+      "version": "0.6.0",
+      "dependencies": {
+        "rimraf": {
+          "version": "2.2.8"
+        }
+      }
+    },
+    "grunt-contrib-compress": {
+      "version": "0.12.0",
+      "dependencies": {
+        "archiver": {
+          "version": "0.11.0",
+          "dependencies": {
+            "async": {
+              "version": "0.9.0"
+            },
+            "buffer-crc32": {
+              "version": "0.2.5"
+            },
+            "glob": {
+              "version": "3.2.11",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "minimatch": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.5.0"
+                    },
+                    "sigmund": {
+                      "version": "1.0.0"
+                    }
+                  }
+                }
+              }
+            },
+            "lazystream": {
+              "version": "0.1.0"
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "tar-stream": {
+              "version": "0.4.7",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4"
+                },
+                "end-of-stream": {
+                  "version": "1.1.0",
+                  "dependencies": {
+                    "once": {
+                      "version": "1.3.1",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0"
+                }
+              }
+            },
+            "zip-stream": {
+              "version": "0.4.1",
+              "dependencies": {
+                "compress-commons": {
+                  "version": "0.1.6",
+                  "dependencies": {
+                    "crc32-stream": {
+                      "version": "0.3.3"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0"
+            }
+          }
+        },
+        "prettysize": {
+          "version": "0.0.3"
+        }
+      }
+    },
+    "grunt-contrib-connect": {
+      "version": "0.8.0",
+      "dependencies": {
+        "connect": {
+          "version": "2.19.6",
+          "dependencies": {
+            "basic-auth-connect": {
+              "version": "1.0.0"
+            },
+            "body-parser": {
+              "version": "1.3.1",
+              "dependencies": {
+                "raw-body": {
+                  "version": "1.1.6"
+                }
+              }
+            },
+            "bytes": {
+              "version": "1.0.0"
+            },
+            "cookie": {
+              "version": "0.1.2"
+            },
+            "cookie-parser": {
+              "version": "1.1.0"
+            },
+            "cookie-signature": {
+              "version": "1.0.3"
+            },
+            "compression": {
+              "version": "1.0.7",
+              "dependencies": {
+                "accepts": {
+                  "version": "1.0.3",
+                  "dependencies": {
+                    "mime": {
+                      "version": "1.2.11"
+                    },
+                    "negotiator": {
+                      "version": "0.4.6"
+                    }
+                  }
+                },
+                "compressible": {
+                  "version": "1.1.0"
+                },
+                "vary": {
+                  "version": "0.1.0"
+                }
+              }
+            },
+            "connect-timeout": {
+              "version": "1.1.0",
+              "dependencies": {
+                "debug": {
+                  "version": "0.8.1"
+                }
+              }
+            },
+            "csurf": {
+              "version": "1.2.1",
+              "dependencies": {
+                "csrf-tokens": {
+                  "version": "1.0.4",
+                  "dependencies": {
+                    "rndm": {
+                      "version": "1.1.0"
+                    },
+                    "uid2": {
+                      "version": "0.0.3"
+                    },
+                    "scmp": {
+                      "version": "0.0.3"
+                    }
+                  }
+                }
+              }
+            },
+            "debug": {
+              "version": "1.0.2",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2"
+                }
+              }
+            },
+            "errorhandler": {
+              "version": "1.0.2"
+            },
+            "escape-html": {
+              "version": "1.0.1"
+            },
+            "express-session": {
+              "version": "1.2.1",
+              "dependencies": {
+                "utils-merge": {
+                  "version": "1.0.0"
+                },
+                "uid2": {
+                  "version": "0.0.3"
+                },
+                "buffer-crc32": {
+                  "version": "0.2.1"
+                },
+                "debug": {
+                  "version": "0.8.1"
+                }
+              }
+            },
+            "fresh": {
+              "version": "0.2.2"
+            },
+            "method-override": {
+              "version": "2.0.2",
+              "dependencies": {
+                "methods": {
+                  "version": "1.0.1"
+                },
+                "vary": {
+                  "version": "0.1.0"
+                }
+              }
+            },
+            "morgan": {
+              "version": "1.1.1"
+            },
+            "multiparty": {
+              "version": "3.2.8",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "stream-counter": {
+                  "version": "0.2.0"
+                }
+              }
+            },
+            "on-headers": {
+              "version": "0.0.0"
+            },
+            "parseurl": {
+              "version": "1.0.1"
+            },
+            "qs": {
+              "version": "0.6.6"
+            },
+            "response-time": {
+              "version": "2.0.0"
+            },
+            "serve-favicon": {
+              "version": "2.0.1"
+            },
+            "serve-index": {
+              "version": "1.1.1",
+              "dependencies": {
+                "accepts": {
+                  "version": "1.0.3",
+                  "dependencies": {
+                    "mime": {
+                      "version": "1.2.11"
+                    },
+                    "negotiator": {
+                      "version": "0.4.6"
+                    }
+                  }
+                },
+                "batch": {
+                  "version": "0.5.0"
+                }
+              }
+            },
+            "serve-static": {
+              "version": "1.2.3",
+              "dependencies": {
+                "send": {
+                  "version": "0.4.3",
+                  "dependencies": {
+                    "finished": {
+                      "version": "1.2.2",
+                      "dependencies": {
+                        "ee-first": {
+                          "version": "1.0.3"
+                        }
+                      }
+                    },
+                    "mime": {
+                      "version": "1.2.11"
+                    },
+                    "range-parser": {
+                      "version": "1.0.2"
+                    }
+                  }
+                }
+              }
+            },
+            "type-is": {
+              "version": "1.2.1",
+              "dependencies": {
+                "mime-types": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "vhost": {
+              "version": "1.0.0"
+            },
+            "pause": {
+              "version": "0.0.1"
+            }
+          }
+        },
+        "connect-livereload": {
+          "version": "0.4.1"
+        },
+        "open": {
+          "version": "0.0.5"
+        },
+        "portscanner": {
+          "version": "0.2.3",
+          "dependencies": {
+            "async": {
+              "version": "0.1.15"
+            }
+          }
+        },
+        "async": {
+          "version": "0.9.0"
+        }
+      }
+    },
+    "grunt-contrib-copy": {
+      "version": "0.6.0",
+      "dependencies": {
+        "chalk": {
+          "version": "0.5.1",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0"
+            }
+          }
+        }
+      }
+    },
+    "grunt-contrib-jshint": {
+      "version": "0.10.0",
+      "dependencies": {
+        "jshint": {
+          "version": "2.5.11",
+          "dependencies": {
+            "cli": {
+              "version": "0.6.6",
+              "dependencies": {
+                "glob": {
+                  "version": "3.2.11",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.5.0"
+                        },
+                        "sigmund": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "console-browserify": {
+              "version": "1.1.0",
+              "dependencies": {
+                "date-now": {
+                  "version": "0.1.4"
+                }
+              }
+            },
+            "exit": {
+              "version": "0.1.2"
+            },
+            "htmlparser2": {
+              "version": "3.8.2",
+              "dependencies": {
+                "domhandler": {
+                  "version": "2.3.0"
+                },
+                "domutils": {
+                  "version": "1.5.1",
+                  "dependencies": {
+                    "dom-serializer": {
+                      "version": "0.1.0",
+                      "dependencies": {
+                        "domelementtype": {
+                          "version": "1.1.3"
+                        },
+                        "entities": {
+                          "version": "1.1.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "domelementtype": {
+                  "version": "1.3.0"
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "entities": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "minimatch": {
+              "version": "1.0.0",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0"
+                },
+                "sigmund": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "strip-json-comments": {
+              "version": "1.0.2"
+            },
+            "underscore": {
+              "version": "1.6.0"
+            }
+          }
+        },
+        "hooker": {
+          "version": "0.2.3"
+        }
+      }
+    },
+    "grunt-ddescribe-iit": {
+      "version": "0.0.6",
+      "dependencies": {
+        "bluebird": {
+          "version": "2.9.24"
+        },
+        "win-spawn": {
+          "version": "2.0.0"
+        }
+      }
+    },
+    "grunt-jasmine-node": {
+      "version": "0.1.0",
+      "resolved": "git://github.com/vojtajina/grunt-jasmine-node.git#ced17cbe52c1412b2ada53160432a5b681f37cd7"
+    },
+    "grunt-jscs": {
+      "version": "1.2.0",
+      "dependencies": {
+        "hooker": {
+          "version": "0.2.3"
+        },
+        "jscs": {
+          "version": "1.10.0",
+          "dependencies": {
+            "colors": {
+              "version": "1.0.3"
+            },
+            "commander": {
+              "version": "2.5.1"
+            },
+            "esprima": {
+              "version": "1.2.5"
+            },
+            "esprima-harmony-jscs": {
+              "version": "1.1.0-regex-token-fix"
+            },
+            "estraverse": {
+              "version": "1.9.3"
+            },
+            "exit": {
+              "version": "0.1.2"
+            },
+            "glob": {
+              "version": "4.0.6",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.6"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "minimatch": {
+                  "version": "1.0.0",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.5.0"
+                    },
+                    "sigmund": {
+                      "version": "1.0.0"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "minimatch": {
+              "version": "2.0.4",
+              "dependencies": {
+                "brace-expansion": {
+                  "version": "1.1.0",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.2.0"
+                    },
+                    "concat-map": {
+                      "version": "0.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "strip-json-comments": {
+              "version": "1.0.2"
+            },
+            "vow-fs": {
+              "version": "0.3.4",
+              "dependencies": {
+                "node-uuid": {
+                  "version": "1.4.3"
+                },
+                "vow-queue": {
+                  "version": "0.4.1"
+                },
+                "glob": {
+                  "version": "4.5.3",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "xmlbuilder": {
+              "version": "2.4.6",
+              "dependencies": {
+                "lodash-node": {
+                  "version": "2.4.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "1.2.1"
+            }
+          }
+        },
+        "vow": {
+          "version": "0.4.9"
+        }
+      }
+    },
+    "grunt-merge-conflict": {
+      "version": "0.0.2"
+    },
+    "grunt-shell": {
+      "version": "1.1.2",
+      "dependencies": {
+        "chalk": {
+          "version": "1.0.0",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "2.0.1"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3"
+            },
+            "has-ansi": {
+              "version": "1.0.3",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "1.1.1"
+                },
+                "get-stdin": {
+                  "version": "4.0.1"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "2.0.1",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "1.1.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "1.3.1"
+            }
+          }
+        }
+      }
+    },
+    "gulp": {
+      "version": "3.8.11",
+      "dependencies": {
+        "archy": {
+          "version": "1.0.0"
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0"
+            }
+          }
+        },
+        "deprecated": {
+          "version": "0.0.1"
+        },
+        "interpret": {
+          "version": "0.3.10"
+        },
+        "liftoff": {
+          "version": "2.0.3",
+          "dependencies": {
+            "extend": {
+              "version": "2.0.0"
+            },
+            "findup-sync": {
+              "version": "0.2.1",
+              "dependencies": {
+                "glob": {
+                  "version": "4.3.5",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "minimatch": {
+                      "version": "2.0.4",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "flagged-respawn": {
+              "version": "0.3.1"
+            },
+            "resolve": {
+              "version": "1.1.6"
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.1.1"
+        },
+        "orchestrator": {
+          "version": "0.3.7",
+          "dependencies": {
+            "end-of-stream": {
+              "version": "0.1.5",
+              "dependencies": {
+                "once": {
+                  "version": "1.3.1",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "sequencify": {
+              "version": "0.0.7"
+            },
+            "stream-consume": {
+              "version": "0.1.0"
+            }
+          }
+        },
+        "pretty-hrtime": {
+          "version": "0.2.2"
+        },
+        "semver": {
+          "version": "4.3.3"
+        },
+        "tildify": {
+          "version": "1.0.0",
+          "dependencies": {
+            "user-home": {
+              "version": "1.1.1"
+            }
+          }
+        },
+        "v8flags": {
+          "version": "2.0.3",
+          "dependencies": {
+            "user-home": {
+              "version": "1.1.1"
+            }
+          }
+        },
+        "vinyl-fs": {
+          "version": "0.3.13",
+          "dependencies": {
+            "defaults": {
+              "version": "1.0.2",
+              "dependencies": {
+                "clone": {
+                  "version": "0.1.19"
+                }
+              }
+            },
+            "glob-stream": {
+              "version": "3.1.18",
+              "dependencies": {
+                "glob": {
+                  "version": "4.5.3",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.4",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "ordered-read-streams": {
+                  "version": "0.1.0"
+                },
+                "glob2base": {
+                  "version": "0.0.12",
+                  "dependencies": {
+                    "find-index": {
+                      "version": "0.1.1"
+                    }
+                  }
+                },
+                "unique-stream": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "glob-watcher": {
+              "version": "0.0.6",
+              "dependencies": {
+                "gaze": {
+                  "version": "0.5.1",
+                  "dependencies": {
+                    "globule": {
+                      "version": "0.1.0",
+                      "dependencies": {
+                        "lodash": {
+                          "version": "1.0.2"
+                        },
+                        "glob": {
+                          "version": "3.1.21",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "1.2.3"
+                            },
+                            "inherits": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "0.2.14",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.5.0"
+                            },
+                            "sigmund": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "graceful-fs": {
+              "version": "3.0.6"
+            },
+            "mkdirp": {
+              "version": "0.5.0",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8"
+                }
+              }
+            },
+            "strip-bom": {
+              "version": "1.0.0",
+              "dependencies": {
+                "first-chunk-stream": {
+                  "version": "1.0.0"
+                },
+                "is-utf8": {
+                  "version": "0.2.0"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.3",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.4.6",
+              "dependencies": {
+                "clone": {
+                  "version": "0.2.0"
+                },
+                "clone-stats": {
+                  "version": "0.0.1"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "gulp-concat": {
+      "version": "2.5.2",
+      "dependencies": {
+        "concat-with-sourcemaps": {
+          "version": "1.0.2",
+          "dependencies": {
+            "source-map": {
+              "version": "0.4.2",
+              "dependencies": {
+                "amdefine": {
+                  "version": "0.1.0"
+                }
+              }
+            }
+          }
+        },
+        "through2": {
+          "version": "0.6.3",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.0"
+            }
+          }
+        }
+      }
+    },
+    "gulp-foreach": {
+      "version": "0.0.1",
+      "dependencies": {
+        "gulp-util": {
+          "version": "2.2.20",
+          "dependencies": {
+            "chalk": {
+              "version": "0.5.1",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "1.1.0"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3"
+                },
+                "has-ansi": {
+                  "version": "0.1.0",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.2.1"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.2.1"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "0.2.0"
+                }
+              }
+            },
+            "dateformat": {
+              "version": "1.0.11",
+              "dependencies": {
+                "get-stdin": {
+                  "version": "4.0.1"
+                },
+                "meow": {
+                  "version": "3.1.0",
+                  "dependencies": {
+                    "camelcase-keys": {
+                      "version": "1.0.0",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.0.2"
+                        },
+                        "map-obj": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    },
+                    "indent-string": {
+                      "version": "1.2.1",
+                      "dependencies": {
+                        "repeating": {
+                          "version": "1.1.2",
+                          "dependencies": {
+                            "is-finite": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "minimist": {
+                      "version": "1.1.1"
+                    },
+                    "object-assign": {
+                      "version": "2.0.0"
+                    }
+                  }
+                }
+              }
+            },
+            "lodash._reinterpolate": {
+              "version": "2.4.1"
+            },
+            "lodash.template": {
+              "version": "2.4.1",
+              "dependencies": {
+                "lodash.defaults": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._objecttypes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash.escape": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._escapehtmlchar": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._htmlescapes": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    },
+                    "lodash._reunescapedhtml": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._htmlescapes": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash._escapestringchar": {
+                  "version": "2.4.1"
+                },
+                "lodash.keys": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1"
+                    },
+                    "lodash.isobject": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._objecttypes": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    },
+                    "lodash._shimkeys": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._objecttypes": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash.templatesettings": {
+                  "version": "2.4.1"
+                },
+                "lodash.values": {
+                  "version": "2.4.1"
+                }
+              }
+            },
+            "minimist": {
+              "version": "0.2.0"
+            },
+            "multipipe": {
+              "version": "0.1.2",
+              "dependencies": {
+                "duplexer2": {
+                  "version": "0.0.2",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1"
+                        },
+                        "isarray": {
+                          "version": "0.0.1"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "through2": {
+              "version": "0.5.1",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "3.0.0"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.2.3",
+              "dependencies": {
+                "clone-stats": {
+                  "version": "0.0.1"
+                }
+              }
+            }
+          }
+        },
+        "through": {
+          "version": "2.3.6"
+        }
+      }
+    },
+    "gulp-jshint": {
+      "version": "1.4.2",
+      "dependencies": {
+        "map-stream": {
+          "version": "0.1.0"
+        },
+        "jshint": {
+          "version": "2.4.4",
+          "dependencies": {
+            "shelljs": {
+              "version": "0.1.4"
+            },
+            "underscore": {
+              "version": "1.4.4"
+            },
+            "cli": {
+              "version": "0.4.5",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.3",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "minimatch": {
+                      "version": "2.0.4",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "minimatch": {
+              "version": "0.4.0",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0"
+                },
+                "sigmund": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "htmlparser2": {
+              "version": "3.3.0",
+              "dependencies": {
+                "domhandler": {
+                  "version": "2.1.0"
+                },
+                "domutils": {
+                  "version": "1.1.6"
+                },
+                "domelementtype": {
+                  "version": "1.3.0"
+                },
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "console-browserify": {
+              "version": "0.1.6"
+            },
+            "exit": {
+              "version": "0.1.2"
+            }
+          }
+        },
+        "gulp-util": {
+          "version": "2.2.20",
+          "dependencies": {
+            "chalk": {
+              "version": "0.5.1",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "1.1.0"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3"
+                },
+                "has-ansi": {
+                  "version": "0.1.0",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.2.1"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.2.1"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "0.2.0"
+                }
+              }
+            },
+            "dateformat": {
+              "version": "1.0.11",
+              "dependencies": {
+                "get-stdin": {
+                  "version": "4.0.1"
+                },
+                "meow": {
+                  "version": "3.1.0",
+                  "dependencies": {
+                    "camelcase-keys": {
+                      "version": "1.0.0",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.0.2"
+                        },
+                        "map-obj": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    },
+                    "indent-string": {
+                      "version": "1.2.1",
+                      "dependencies": {
+                        "repeating": {
+                          "version": "1.1.2",
+                          "dependencies": {
+                            "is-finite": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "minimist": {
+                      "version": "1.1.1"
+                    },
+                    "object-assign": {
+                      "version": "2.0.0"
+                    }
+                  }
+                }
+              }
+            },
+            "lodash._reinterpolate": {
+              "version": "2.4.1"
+            },
+            "lodash.template": {
+              "version": "2.4.1",
+              "dependencies": {
+                "lodash.defaults": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._objecttypes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash.escape": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._escapehtmlchar": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._htmlescapes": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    },
+                    "lodash._reunescapedhtml": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._htmlescapes": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash._escapestringchar": {
+                  "version": "2.4.1"
+                },
+                "lodash.keys": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1"
+                    },
+                    "lodash.isobject": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._objecttypes": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    },
+                    "lodash._shimkeys": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._objecttypes": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash.templatesettings": {
+                  "version": "2.4.1"
+                },
+                "lodash.values": {
+                  "version": "2.4.1"
+                }
+              }
+            },
+            "minimist": {
+              "version": "0.2.0"
+            },
+            "multipipe": {
+              "version": "0.1.2",
+              "dependencies": {
+                "duplexer2": {
+                  "version": "0.0.2",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1"
+                        },
+                        "isarray": {
+                          "version": "0.0.1"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "through2": {
+              "version": "0.5.1",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "3.0.0"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.2.3",
+              "dependencies": {
+                "clone-stats": {
+                  "version": "0.0.1"
+                }
+              }
+            }
+          }
+        },
+        "lodash.clone": {
+          "version": "2.4.1",
+          "dependencies": {
+            "lodash._baseclone": {
+              "version": "2.4.1",
+              "dependencies": {
+                "lodash.assign": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash.keys": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._isnative": {
+                          "version": "2.4.1"
+                        },
+                        "lodash._shimkeys": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    },
+                    "lodash._objecttypes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash.foreach": {
+                  "version": "2.4.1"
+                },
+                "lodash.forown": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash.keys": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._isnative": {
+                          "version": "2.4.1"
+                        },
+                        "lodash._shimkeys": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    },
+                    "lodash._objecttypes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash._getarray": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._arraypool": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash.isarray": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash.isobject": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._objecttypes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash._releasearray": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._arraypool": {
+                      "version": "2.4.1"
+                    },
+                    "lodash._maxpoolsize": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash._slice": {
+                  "version": "2.4.1"
+                }
+              }
+            },
+            "lodash._basecreatecallback": {
+              "version": "2.4.1",
+              "dependencies": {
+                "lodash.bind": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._createwrapper": {
+                      "version": "2.4.1",
+                      "dependencies": {
+                        "lodash._basebind": {
+                          "version": "2.4.1",
+                          "dependencies": {
+                            "lodash._basecreate": {
+                              "version": "2.4.1",
+                              "dependencies": {
+                                "lodash._isnative": {
+                                  "version": "2.4.1"
+                                },
+                                "lodash.noop": {
+                                  "version": "2.4.1"
+                                }
+                              }
+                            },
+                            "lodash.isobject": {
+                              "version": "2.4.1",
+                              "dependencies": {
+                                "lodash._objecttypes": {
+                                  "version": "2.4.1"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash._basecreatewrapper": {
+                          "version": "2.4.1",
+                          "dependencies": {
+                            "lodash._basecreate": {
+                              "version": "2.4.1",
+                              "dependencies": {
+                                "lodash._isnative": {
+                                  "version": "2.4.1"
+                                },
+                                "lodash.noop": {
+                                  "version": "2.4.1"
+                                }
+                              }
+                            },
+                            "lodash.isobject": {
+                              "version": "2.4.1",
+                              "dependencies": {
+                                "lodash._objecttypes": {
+                                  "version": "2.4.1"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.isfunction": {
+                          "version": "2.4.1"
+                        }
+                      }
+                    },
+                    "lodash._slice": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash.identity": {
+                  "version": "2.4.1"
+                },
+                "lodash._setbinddata": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1"
+                    },
+                    "lodash.noop": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash.support": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "gulp-rename": {
+      "version": "1.2.2"
+    },
+    "gulp-sourcemaps": {
+      "version": "1.5.1",
+      "dependencies": {
+        "convert-source-map": {
+          "version": "1.0.0"
+        },
+        "graceful-fs": {
+          "version": "3.0.6"
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "dependencies": {
+            "first-chunk-stream": {
+              "version": "1.0.0"
+            },
+            "is-utf8": {
+              "version": "0.2.0"
+            }
+          }
+        },
+        "through2": {
+          "version": "0.6.3",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.0"
+            }
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "dependencies": {
+            "clone": {
+              "version": "0.2.0"
+            },
+            "clone-stats": {
+              "version": "0.0.1"
+            }
+          }
+        }
+      }
+    },
+    "gulp-uglify": {
+      "version": "1.1.0",
+      "dependencies": {
+        "deepmerge": {
+          "version": "0.2.7"
+        },
+        "through2": {
+          "version": "0.6.3",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.0"
+            }
+          }
+        },
+        "uglify-js": {
+          "version": "2.4.16",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10"
+            },
+            "source-map": {
+              "version": "0.1.34",
+              "dependencies": {
+                "amdefine": {
+                  "version": "0.1.0"
+                }
+              }
+            },
+            "optimist": {
+              "version": "0.3.7",
+              "dependencies": {
+                "wordwrap": {
+                  "version": "0.0.2"
+                }
+              }
+            },
+            "uglify-to-browserify": {
+              "version": "1.0.2"
+            }
+          }
+        },
+        "vinyl-sourcemaps-apply": {
+          "version": "0.1.4",
+          "dependencies": {
+            "source-map": {
+              "version": "0.1.43",
+              "dependencies": {
+                "amdefine": {
+                  "version": "0.1.0"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "gulp-util": {
+      "version": "3.0.4",
+      "dependencies": {
+        "array-differ": {
+          "version": "1.0.0"
+        },
+        "array-uniq": {
+          "version": "1.0.2"
+        },
+        "beeper": {
+          "version": "1.0.0"
+        },
+        "chalk": {
+          "version": "1.0.0",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "2.0.1"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3"
+            },
+            "has-ansi": {
+              "version": "1.0.3",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "1.1.1"
+                },
+                "get-stdin": {
+                  "version": "4.0.1"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "2.0.1",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "1.1.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "1.3.1"
+            }
+          }
+        },
+        "dateformat": {
+          "version": "1.0.11",
+          "dependencies": {
+            "get-stdin": {
+              "version": "4.0.1"
+            },
+            "meow": {
+              "version": "3.1.0",
+              "dependencies": {
+                "camelcase-keys": {
+                  "version": "1.0.0",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "1.0.2"
+                    },
+                    "map-obj": {
+                      "version": "1.0.0"
+                    }
+                  }
+                },
+                "indent-string": {
+                  "version": "1.2.1",
+                  "dependencies": {
+                    "repeating": {
+                      "version": "1.1.2",
+                      "dependencies": {
+                        "is-finite": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "lodash._reescape": {
+          "version": "3.0.0"
+        },
+        "lodash._reevaluate": {
+          "version": "3.0.0"
+        },
+        "lodash._reinterpolate": {
+          "version": "3.0.0"
+        },
+        "lodash.template": {
+          "version": "3.4.0",
+          "dependencies": {
+            "lodash._basecopy": {
+              "version": "3.0.0"
+            },
+            "lodash._basetostring": {
+              "version": "3.0.0"
+            },
+            "lodash._basevalues": {
+              "version": "3.0.0"
+            },
+            "lodash._isiterateecall": {
+              "version": "3.0.5"
+            },
+            "lodash.escape": {
+              "version": "3.0.0"
+            },
+            "lodash.keys": {
+              "version": "3.0.5",
+              "dependencies": {
+                "lodash.isarguments": {
+                  "version": "3.0.1"
+                },
+                "lodash.isarray": {
+                  "version": "3.0.1"
+                },
+                "lodash.isnative": {
+                  "version": "3.0.1"
+                }
+              }
+            },
+            "lodash.restparam": {
+              "version": "3.6.0"
+            },
+            "lodash.templatesettings": {
+              "version": "3.1.0"
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.1.1"
+        },
+        "multipipe": {
+          "version": "0.1.2",
+          "dependencies": {
+            "duplexer2": {
+              "version": "0.0.2",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "object-assign": {
+          "version": "2.0.0"
+        },
+        "replace-ext": {
+          "version": "0.0.1"
+        },
+        "through2": {
+          "version": "0.6.3",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.0"
+            }
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "dependencies": {
+            "clone": {
+              "version": "0.2.0"
+            },
+            "clone-stats": {
+              "version": "0.0.1"
+            }
+          }
+        }
+      }
+    },
+    "jasmine-node": {
+      "version": "1.14.5",
+      "dependencies": {
+        "coffee-script": {
+          "version": "1.9.1"
+        },
+        "jasmine-growl-reporter": {
+          "version": "0.0.3",
+          "dependencies": {
+            "growl": {
+              "version": "1.7.0"
+            }
+          }
+        },
+        "requirejs": {
+          "version": "2.1.17"
+        },
+        "walkdir": {
+          "version": "0.0.7"
+        },
+        "underscore": {
+          "version": "1.8.3"
+        },
+        "gaze": {
+          "version": "0.3.4",
+          "dependencies": {
+            "minimatch": {
+              "version": "0.2.14",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0"
+                },
+                "sigmund": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "fileset": {
+              "version": "0.1.5",
+              "dependencies": {
+                "glob": {
+                  "version": "3.2.11",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.5.0"
+                        },
+                        "sigmund": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "mkdirp": {
+          "version": "0.3.5"
+        }
+      }
+    },
+    "jasmine-reporters": {
+      "version": "1.0.1",
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.3.5"
+        }
+      }
+    },
+    "jshint-stylish": {
+      "version": "1.0.1",
+      "dependencies": {
+        "chalk": {
+          "version": "1.0.0",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "2.0.1"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3"
+            },
+            "has-ansi": {
+              "version": "1.0.3",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "1.1.1"
+                },
+                "get-stdin": {
+                  "version": "4.0.1"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "2.0.1",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "1.1.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "1.3.1"
+            }
+          }
+        },
+        "log-symbols": {
+          "version": "1.0.2"
+        },
+        "string-length": {
+          "version": "1.0.0",
+          "dependencies": {
+            "strip-ansi": {
+              "version": "2.0.1",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "1.1.1"
+                }
+              }
+            }
+          }
+        },
+        "text-table": {
+          "version": "0.2.0"
+        }
+      }
+    },
+    "karma": {
+      "version": "0.12.32",
+      "dependencies": {
+        "di": {
+          "version": "0.0.1"
+        },
+        "socket.io": {
+          "version": "1.3.5",
+          "dependencies": {
+            "engine.io": {
+              "version": "1.5.1",
+              "dependencies": {
+                "debug": {
+                  "version": "1.0.3",
+                  "dependencies": {
+                    "ms": {
+                      "version": "0.6.2"
+                    }
+                  }
+                },
+                "ws": {
+                  "version": "0.5.0",
+                  "dependencies": {
+                    "nan": {
+                      "version": "1.4.3"
+                    },
+                    "options": {
+                      "version": "0.0.6"
+                    },
+                    "ultron": {
+                      "version": "1.0.1"
+                    }
+                  }
+                },
+                "engine.io-parser": {
+                  "version": "1.2.1",
+                  "dependencies": {
+                    "after": {
+                      "version": "0.8.1"
+                    },
+                    "arraybuffer.slice": {
+                      "version": "0.0.6"
+                    },
+                    "base64-arraybuffer": {
+                      "version": "0.1.2"
+                    },
+                    "blob": {
+                      "version": "0.0.2"
+                    },
+                    "has-binary": {
+                      "version": "0.1.5",
+                      "dependencies": {
+                        "isarray": {
+                          "version": "0.0.1"
+                        }
+                      }
+                    },
+                    "utf8": {
+                      "version": "2.0.0"
+                    }
+                  }
+                },
+                "base64id": {
+                  "version": "0.1.0"
+                }
+              }
+            },
+            "socket.io-parser": {
+              "version": "2.2.4",
+              "dependencies": {
+                "debug": {
+                  "version": "0.7.4"
+                },
+                "json3": {
+                  "version": "3.2.6"
+                },
+                "component-emitter": {
+                  "version": "1.1.2"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                }
+              }
+            },
+            "socket.io-client": {
+              "version": "1.3.5",
+              "dependencies": {
+                "debug": {
+                  "version": "0.7.4"
+                },
+                "engine.io-client": {
+                  "version": "1.5.1",
+                  "dependencies": {
+                    "has-cors": {
+                      "version": "1.0.3",
+                      "dependencies": {
+                        "global": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    },
+                    "ws": {
+                      "version": "0.4.31",
+                      "dependencies": {
+                        "commander": {
+                          "version": "0.6.1"
+                        },
+                        "nan": {
+                          "version": "0.3.2"
+                        },
+                        "tinycolor": {
+                          "version": "0.0.1"
+                        },
+                        "options": {
+                          "version": "0.0.6"
+                        }
+                      }
+                    },
+                    "xmlhttprequest": {
+                      "version": "1.5.0"
+                    },
+                    "engine.io-parser": {
+                      "version": "1.2.1",
+                      "dependencies": {
+                        "after": {
+                          "version": "0.8.1"
+                        },
+                        "arraybuffer.slice": {
+                          "version": "0.0.6"
+                        },
+                        "base64-arraybuffer": {
+                          "version": "0.1.2"
+                        },
+                        "blob": {
+                          "version": "0.0.2"
+                        },
+                        "has-binary": {
+                          "version": "0.1.5",
+                          "dependencies": {
+                            "isarray": {
+                              "version": "0.0.1"
+                            }
+                          }
+                        },
+                        "utf8": {
+                          "version": "2.0.0"
+                        }
+                      }
+                    },
+                    "debug": {
+                      "version": "1.0.4",
+                      "dependencies": {
+                        "ms": {
+                          "version": "0.6.2"
+                        }
+                      }
+                    },
+                    "parseuri": {
+                      "version": "0.0.4",
+                      "dependencies": {
+                        "better-assert": {
+                          "version": "1.0.2",
+                          "dependencies": {
+                            "callsite": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "parsejson": {
+                      "version": "0.0.1",
+                      "dependencies": {
+                        "better-assert": {
+                          "version": "1.0.2",
+                          "dependencies": {
+                            "callsite": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "parseqs": {
+                      "version": "0.0.2",
+                      "dependencies": {
+                        "better-assert": {
+                          "version": "1.0.2",
+                          "dependencies": {
+                            "callsite": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "component-inherit": {
+                      "version": "0.0.3"
+                    }
+                  }
+                },
+                "component-bind": {
+                  "version": "1.0.0"
+                },
+                "component-emitter": {
+                  "version": "1.1.2"
+                },
+                "object-component": {
+                  "version": "0.0.3"
+                },
+                "has-binary": {
+                  "version": "0.1.6",
+                  "dependencies": {
+                    "isarray": {
+                      "version": "0.0.1"
+                    }
+                  }
+                },
+                "indexof": {
+                  "version": "0.0.1"
+                },
+                "parseuri": {
+                  "version": "0.0.2",
+                  "dependencies": {
+                    "better-assert": {
+                      "version": "1.0.2",
+                      "dependencies": {
+                        "callsite": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    }
+                  }
+                },
+                "to-array": {
+                  "version": "0.1.3"
+                },
+                "backo2": {
+                  "version": "1.0.2"
+                }
+              }
+            },
+            "socket.io-adapter": {
+              "version": "0.3.1",
+              "dependencies": {
+                "debug": {
+                  "version": "1.0.2",
+                  "dependencies": {
+                    "ms": {
+                      "version": "0.6.2"
+                    }
+                  }
+                },
+                "socket.io-parser": {
+                  "version": "2.2.2",
+                  "dependencies": {
+                    "debug": {
+                      "version": "0.7.4"
+                    },
+                    "json3": {
+                      "version": "3.2.6"
+                    },
+                    "component-emitter": {
+                      "version": "1.1.2"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    }
+                  }
+                },
+                "object-keys": {
+                  "version": "1.0.1"
+                }
+              }
+            },
+            "has-binary-data": {
+              "version": "0.1.3",
+              "dependencies": {
+                "isarray": {
+                  "version": "0.0.1"
+                }
+              }
+            },
+            "debug": {
+              "version": "2.1.0",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2"
+                }
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "0.12.6",
+          "dependencies": {
+            "readdirp": {
+              "version": "1.3.0",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                }
+              }
+            },
+            "async-each": {
+              "version": "0.1.6"
+            },
+            "fsevents": {
+              "version": "0.3.5",
+              "dependencies": {
+                "nan": {
+                  "version": "1.5.3"
+                }
+              }
+            }
+          }
+        },
+        "glob": {
+          "version": "3.2.11",
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.1"
+            },
+            "minimatch": {
+              "version": "0.3.0",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0"
+                },
+                "sigmund": {
+                  "version": "1.0.0"
+                }
+              }
+            }
+          }
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "dependencies": {
+            "lru-cache": {
+              "version": "2.5.0"
+            },
+            "sigmund": {
+              "version": "1.0.0"
+            }
+          }
+        },
+        "expand-braces": {
+          "version": "0.1.1",
+          "dependencies": {
+            "array-slice": {
+              "version": "0.2.2"
+            },
+            "array-uniq": {
+              "version": "1.0.2"
+            },
+            "braces": {
+              "version": "0.1.5",
+              "dependencies": {
+                "expand-range": {
+                  "version": "0.1.1",
+                  "dependencies": {
+                    "is-number": {
+                      "version": "0.1.1"
+                    },
+                    "repeat-string": {
+                      "version": "0.2.2"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "http-proxy": {
+          "version": "0.10.4",
+          "dependencies": {
+            "pkginfo": {
+              "version": "0.3.0"
+            },
+            "utile": {
+              "version": "0.2.1",
+              "dependencies": {
+                "async": {
+                  "version": "0.2.10"
+                },
+                "deep-equal": {
+                  "version": "1.0.0"
+                },
+                "i": {
+                  "version": "0.3.3"
+                },
+                "mkdirp": {
+                  "version": "0.5.0",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8"
+                    }
+                  }
+                },
+                "ncp": {
+                  "version": "0.4.2"
+                }
+              }
+            }
+          }
+        },
+        "optimist": {
+          "version": "0.6.1",
+          "dependencies": {
+            "wordwrap": {
+              "version": "0.0.2"
+            },
+            "minimist": {
+              "version": "0.0.10"
+            }
+          }
+        },
+        "rimraf": {
+          "version": "2.2.8"
+        },
+        "q": {
+          "version": "0.9.7"
+        },
+        "colors": {
+          "version": "0.6.2"
+        },
+        "mime": {
+          "version": "1.2.11"
+        },
+        "log4js": {
+          "version": "0.6.22",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10"
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "semver": {
+              "version": "1.1.4"
+            }
+          }
+        },
+        "useragent": {
+          "version": "2.0.10",
+          "dependencies": {
+            "lru-cache": {
+              "version": "2.2.4"
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "2.0.3"
+        },
+        "connect": {
+          "version": "2.26.6",
+          "dependencies": {
+            "basic-auth-connect": {
+              "version": "1.0.0"
+            },
+            "body-parser": {
+              "version": "1.8.4",
+              "dependencies": {
+                "iconv-lite": {
+                  "version": "0.4.4"
+                },
+                "on-finished": {
+                  "version": "2.1.0",
+                  "dependencies": {
+                    "ee-first": {
+                      "version": "1.0.5"
+                    }
+                  }
+                },
+                "raw-body": {
+                  "version": "1.3.0"
+                }
+              }
+            },
+            "bytes": {
+              "version": "1.0.0"
+            },
+            "cookie": {
+              "version": "0.1.2"
+            },
+            "cookie-parser": {
+              "version": "1.3.4",
+              "dependencies": {
+                "cookie-signature": {
+                  "version": "1.0.6"
+                }
+              }
+            },
+            "cookie-signature": {
+              "version": "1.0.5"
+            },
+            "compression": {
+              "version": "1.1.2",
+              "dependencies": {
+                "accepts": {
+                  "version": "1.1.4",
+                  "dependencies": {
+                    "mime-types": {
+                      "version": "2.0.10",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.8.0"
+                        }
+                      }
+                    },
+                    "negotiator": {
+                      "version": "0.4.9"
+                    }
+                  }
+                },
+                "compressible": {
+                  "version": "2.0.2",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.8.0"
+                    }
+                  }
+                },
+                "vary": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "connect-timeout": {
+              "version": "1.3.0",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2"
+                }
+              }
+            },
+            "csurf": {
+              "version": "1.6.6",
+              "dependencies": {
+                "csrf": {
+                  "version": "2.0.6",
+                  "dependencies": {
+                    "base64-url": {
+                      "version": "1.2.1"
+                    },
+                    "rndm": {
+                      "version": "1.1.0"
+                    },
+                    "scmp": {
+                      "version": "1.0.0"
+                    },
+                    "uid-safe": {
+                      "version": "1.1.0",
+                      "dependencies": {
+                        "native-or-bluebird": {
+                          "version": "1.1.2"
+                        }
+                      }
+                    }
+                  }
+                },
+                "http-errors": {
+                  "version": "1.2.8",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "statuses": {
+                      "version": "1.2.1"
+                    }
+                  }
+                }
+              }
+            },
+            "debug": {
+              "version": "2.0.0",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2"
+                }
+              }
+            },
+            "depd": {
+              "version": "0.4.5"
+            },
+            "errorhandler": {
+              "version": "1.2.4",
+              "dependencies": {
+                "accepts": {
+                  "version": "1.1.4",
+                  "dependencies": {
+                    "mime-types": {
+                      "version": "2.0.10",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.8.0"
+                        }
+                      }
+                    },
+                    "negotiator": {
+                      "version": "0.4.9"
+                    }
+                  }
+                },
+                "escape-html": {
+                  "version": "1.0.1"
+                }
+              }
+            },
+            "express-session": {
+              "version": "1.8.2",
+              "dependencies": {
+                "crc": {
+                  "version": "3.0.0"
+                },
+                "uid-safe": {
+                  "version": "1.0.1",
+                  "dependencies": {
+                    "mz": {
+                      "version": "1.3.0",
+                      "dependencies": {
+                        "native-or-bluebird": {
+                          "version": "1.2.0"
+                        },
+                        "thenify": {
+                          "version": "3.1.0"
+                        },
+                        "thenify-all": {
+                          "version": "1.6.0"
+                        }
+                      }
+                    },
+                    "base64-url": {
+                      "version": "1.2.1"
+                    }
+                  }
+                },
+                "utils-merge": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "finalhandler": {
+              "version": "0.2.0",
+              "dependencies": {
+                "escape-html": {
+                  "version": "1.0.1"
+                }
+              }
+            },
+            "fresh": {
+              "version": "0.2.4"
+            },
+            "media-typer": {
+              "version": "0.3.0"
+            },
+            "method-override": {
+              "version": "2.2.0",
+              "dependencies": {
+                "methods": {
+                  "version": "1.1.0"
+                },
+                "vary": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "morgan": {
+              "version": "1.3.2",
+              "dependencies": {
+                "basic-auth": {
+                  "version": "1.0.0"
+                },
+                "on-finished": {
+                  "version": "2.1.0",
+                  "dependencies": {
+                    "ee-first": {
+                      "version": "1.0.5"
+                    }
+                  }
+                }
+              }
+            },
+            "multiparty": {
+              "version": "3.3.2",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "stream-counter": {
+                  "version": "0.2.0"
+                }
+              }
+            },
+            "on-headers": {
+              "version": "1.0.0"
+            },
+            "parseurl": {
+              "version": "1.3.0"
+            },
+            "qs": {
+              "version": "2.2.4"
+            },
+            "response-time": {
+              "version": "2.0.1"
+            },
+            "serve-favicon": {
+              "version": "2.1.7",
+              "dependencies": {
+                "etag": {
+                  "version": "1.5.1",
+                  "dependencies": {
+                    "crc": {
+                      "version": "3.2.1"
+                    }
+                  }
+                },
+                "ms": {
+                  "version": "0.6.2"
+                }
+              }
+            },
+            "serve-index": {
+              "version": "1.2.1",
+              "dependencies": {
+                "accepts": {
+                  "version": "1.1.4",
+                  "dependencies": {
+                    "mime-types": {
+                      "version": "2.0.10",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.8.0"
+                        }
+                      }
+                    },
+                    "negotiator": {
+                      "version": "0.4.9"
+                    }
+                  }
+                },
+                "batch": {
+                  "version": "0.5.1"
+                }
+              }
+            },
+            "serve-static": {
+              "version": "1.6.5",
+              "dependencies": {
+                "escape-html": {
+                  "version": "1.0.1"
+                },
+                "send": {
+                  "version": "0.9.3",
+                  "dependencies": {
+                    "destroy": {
+                      "version": "1.0.3"
+                    },
+                    "etag": {
+                      "version": "1.4.0",
+                      "dependencies": {
+                        "crc": {
+                          "version": "3.0.0"
+                        }
+                      }
+                    },
+                    "ms": {
+                      "version": "0.6.2"
+                    },
+                    "on-finished": {
+                      "version": "2.1.0",
+                      "dependencies": {
+                        "ee-first": {
+                          "version": "1.0.5"
+                        }
+                      }
+                    },
+                    "range-parser": {
+                      "version": "1.0.2"
+                    }
+                  }
+                },
+                "utils-merge": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "type-is": {
+              "version": "1.5.7",
+              "dependencies": {
+                "mime-types": {
+                  "version": "2.0.10",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.8.0"
+                    }
+                  }
+                }
+              }
+            },
+            "vhost": {
+              "version": "3.0.0"
+            },
+            "pause": {
+              "version": "0.0.1"
+            }
+          }
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "dependencies": {
+            "amdefine": {
+              "version": "0.1.0"
+            }
+          }
+        },
+        "memoizee": {
+          "version": "0.3.8",
+          "dependencies": {
+            "d": {
+              "version": "0.1.1"
+            },
+            "es5-ext": {
+              "version": "0.10.6",
+              "dependencies": {
+                "es6-iterator": {
+                  "version": "0.1.3"
+                },
+                "es6-symbol": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "es6-weak-map": {
+              "version": "0.1.2",
+              "dependencies": {
+                "es6-iterator": {
+                  "version": "0.1.3",
+                  "dependencies": {
+                    "es6-symbol": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "es6-symbol": {
+                  "version": "0.1.1"
+                }
+              }
+            },
+            "event-emitter": {
+              "version": "0.3.3"
+            },
+            "lru-queue": {
+              "version": "0.1.0"
+            },
+            "next-tick": {
+              "version": "0.2.2"
+            },
+            "timers-ext": {
+              "version": "0.1.0"
+            }
+          }
+        }
+      }
+    },
+    "karma-browserstack-launcher": {
+      "version": "0.1.2",
+      "dependencies": {
+        "browserstack": {
+          "version": "1.0.1"
+        },
+        "q": {
+          "version": "0.9.7"
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "0.1.5"
+    },
+    "karma-firefox-launcher": {
+      "version": "0.1.3"
+    },
+    "karma-jasmine": {
+      "version": "0.1.5"
+    },
+    "karma-junit-reporter": {
+      "version": "0.2.2",
+      "dependencies": {
+        "xmlbuilder": {
+          "version": "0.4.2"
+        }
+      }
+    },
+    "karma-ng-scenario": {
+      "version": "0.1.0"
+    },
+    "karma-sauce-launcher": {
+      "version": "0.2.10",
+      "dependencies": {
+        "wd": {
+          "version": "0.3.11",
+          "dependencies": {
+            "archiver": {
+              "version": "0.12.0",
+              "dependencies": {
+                "buffer-crc32": {
+                  "version": "0.2.5"
+                },
+                "glob": {
+                  "version": "4.0.6",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.6"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "minimatch": {
+                      "version": "1.0.0",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.5.0"
+                        },
+                        "sigmund": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lazystream": {
+                  "version": "0.1.0"
+                },
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "tar-stream": {
+                  "version": "1.0.2",
+                  "dependencies": {
+                    "bl": {
+                      "version": "0.9.4"
+                    },
+                    "end-of-stream": {
+                      "version": "1.1.0",
+                      "dependencies": {
+                        "once": {
+                          "version": "1.3.1",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "xtend": {
+                      "version": "4.0.0"
+                    }
+                  }
+                },
+                "zip-stream": {
+                  "version": "0.4.1",
+                  "dependencies": {
+                    "compress-commons": {
+                      "version": "0.1.6",
+                      "dependencies": {
+                        "crc32-stream": {
+                          "version": "0.3.3"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "async": {
+              "version": "0.9.0"
+            },
+            "q": {
+              "version": "1.0.1"
+            },
+            "request": {
+              "version": "2.46.0",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1"
+                        },
+                        "isarray": {
+                          "version": "0.0.1"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.6.0"
+                },
+                "forever-agent": {
+                  "version": "0.5.2"
+                },
+                "form-data": {
+                  "version": "0.1.4",
+                  "dependencies": {
+                    "combined-stream": {
+                      "version": "0.0.7",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "0.0.5"
+                        }
+                      }
+                    },
+                    "mime": {
+                      "version": "1.2.11"
+                    }
+                  }
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.0"
+                },
+                "mime-types": {
+                  "version": "1.0.2"
+                },
+                "node-uuid": {
+                  "version": "1.4.3"
+                },
+                "qs": {
+                  "version": "1.2.2"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.0"
+                },
+                "tough-cookie": {
+                  "version": "0.12.1",
+                  "dependencies": {
+                    "punycode": {
+                      "version": "1.3.2"
+                    }
+                  }
+                },
+                "http-signature": {
+                  "version": "0.10.1",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5"
+                    },
+                    "asn1": {
+                      "version": "0.1.11"
+                    },
+                    "ctype": {
+                      "version": "0.5.3"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.4.0"
+                },
+                "hawk": {
+                  "version": "1.1.1",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1"
+                    },
+                    "boom": {
+                      "version": "0.4.2"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2"
+                    },
+                    "sntp": {
+                      "version": "0.2.4"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0"
+                },
+                "stringstream": {
+                  "version": "0.0.4"
+                }
+              }
+            },
+            "underscore.string": {
+              "version": "2.3.3"
+            },
+            "vargs": {
+              "version": "0.1.0"
+            }
+          }
+        },
+        "sauce-connect-launcher": {
+          "version": "0.6.1",
+          "dependencies": {
+            "async": {
+              "version": "0.9.0"
+            },
+            "adm-zip": {
+              "version": "0.4.7"
+            },
+            "rimraf": {
+              "version": "2.2.8"
+            }
+          }
+        },
+        "q": {
+          "version": "0.9.7"
+        },
+        "saucelabs": {
+          "version": "0.1.1"
+        }
+      }
+    },
+    "karma-script-launcher": {
+      "version": "0.1.0"
+    },
+    "load-grunt-tasks": {
+      "version": "0.6.0",
+      "dependencies": {
+        "findup-sync": {
+          "version": "0.1.3",
+          "dependencies": {
+            "glob": {
+              "version": "3.2.11",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "minimatch": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.5.0"
+                    },
+                    "sigmund": {
+                      "version": "1.0.0"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "multimatch": {
+          "version": "0.3.0",
+          "dependencies": {
+            "array-differ": {
+              "version": "0.1.0"
+            },
+            "array-union": {
+              "version": "0.1.0",
+              "dependencies": {
+                "array-uniq": {
+                  "version": "0.1.1"
+                }
+              }
+            },
+            "minimatch": {
+              "version": "0.3.0",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0"
+                },
+                "sigmund": {
+                  "version": "1.0.0"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "lodash": {
+      "version": "2.4.1"
+    },
+    "marked": {
+      "version": "0.3.3"
+    },
+    "node-html-encoder": {
+      "version": "0.0.2"
+    },
+    "promises-aplus-tests": {
+      "version": "2.1.0",
+      "dependencies": {
+        "mocha": {
+          "version": "1.21.5",
+          "dependencies": {
+            "commander": {
+              "version": "2.3.0"
+            },
+            "debug": {
+              "version": "2.0.0",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2"
+                }
+              }
+            },
+            "diff": {
+              "version": "1.0.8"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.2"
+            },
+            "glob": {
+              "version": "3.2.3",
+              "dependencies": {
+                "minimatch": {
+                  "version": "0.2.14",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.5.0"
+                    },
+                    "sigmund": {
+                      "version": "1.0.0"
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "2.0.3"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "growl": {
+              "version": "1.8.1"
+            },
+            "jade": {
+              "version": "0.26.3",
+              "dependencies": {
+                "commander": {
+                  "version": "0.6.1"
+                },
+                "mkdirp": {
+                  "version": "0.3.0"
+                }
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.0",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8"
+                }
+              }
+            }
+          }
+        },
+        "sinon": {
+          "version": "1.14.1",
+          "dependencies": {
+            "formatio": {
+              "version": "1.1.1",
+              "dependencies": {
+                "samsam": {
+                  "version": "1.1.2"
+                }
+              }
+            },
+            "util": {
+              "version": "0.10.3",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "lolex": {
+              "version": "1.1.0"
+            }
+          }
+        },
+        "underscore": {
+          "version": "1.6.0"
+        }
+      }
+    },
+    "protractor": {
+      "version": "2.1.0",
+      "dependencies": {
+        "request": {
+          "version": "2.36.0",
+          "dependencies": {
+            "qs": {
+              "version": "0.6.6"
+            },
+            "json-stringify-safe": {
+              "version": "5.0.1"
+            },
+            "mime": {
+              "version": "1.2.11"
+            },
+            "forever-agent": {
+              "version": "0.5.2"
+            },
+            "node-uuid": {
+              "version": "1.4.3"
+            },
+            "tough-cookie": {
+              "version": "1.1.0"
+            },
+            "form-data": {
+              "version": "0.1.4",
+              "dependencies": {
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5"
+                    }
+                  }
+                },
+                "async": {
+                  "version": "0.9.2"
+                }
+              }
+            },
+            "tunnel-agent": {
+              "version": "0.4.0"
+            },
+            "http-signature": {
+              "version": "0.10.1",
+              "dependencies": {
+                "assert-plus": {
+                  "version": "0.1.5"
+                },
+                "asn1": {
+                  "version": "0.1.11"
+                },
+                "ctype": {
+                  "version": "0.5.3"
+                }
+              }
+            },
+            "oauth-sign": {
+              "version": "0.3.0"
+            },
+            "hawk": {
+              "version": "1.0.0",
+              "dependencies": {
+                "hoek": {
+                  "version": "0.9.1"
+                },
+                "boom": {
+                  "version": "0.4.2"
+                },
+                "cryptiles": {
+                  "version": "0.2.2"
+                },
+                "sntp": {
+                  "version": "0.2.4"
+                }
+              }
+            },
+            "aws-sign2": {
+              "version": "0.5.0"
+            }
+          }
+        },
+        "selenium-webdriver": {
+          "version": "2.45.1",
+          "dependencies": {
+            "rimraf": {
+              "version": "2.3.4",
+              "dependencies": {
+                "glob": {
+                  "version": "4.5.3",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    },
+                    "minimatch": {
+                      "version": "2.0.8",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.2",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "tmp": {
+              "version": "0.0.24"
+            },
+            "ws": {
+              "version": "0.7.2",
+              "dependencies": {
+                "options": {
+                  "version": "0.0.6"
+                },
+                "ultron": {
+                  "version": "1.0.1"
+                },
+                "bufferutil": {
+                  "version": "1.1.0",
+                  "dependencies": {
+                    "bindings": {
+                      "version": "1.2.1"
+                    },
+                    "nan": {
+                      "version": "1.8.4"
+                    }
+                  }
+                },
+                "utf-8-validate": {
+                  "version": "1.1.0",
+                  "dependencies": {
+                    "bindings": {
+                      "version": "1.2.1"
+                    },
+                    "nan": {
+                      "version": "1.8.4"
+                    }
+                  }
+                }
+              }
+            },
+            "xml2js": {
+              "version": "0.4.4",
+              "dependencies": {
+                "sax": {
+                  "version": "0.6.1"
+                },
+                "xmlbuilder": {
+                  "version": "2.6.2",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "3.5.0"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "minijasminenode": {
+          "version": "1.1.1"
+        },
+        "jasminewd": {
+          "version": "1.1.0"
+        },
+        "jasminewd2": {
+          "version": "0.0.5"
+        },
+        "jasmine": {
+          "version": "2.3.1",
+          "dependencies": {
+            "exit": {
+              "version": "0.1.2"
+            },
+            "jasmine-core": {
+              "version": "2.3.4"
+            }
+          }
+        },
+        "saucelabs": {
+          "version": "0.1.1"
+        },
+        "glob": {
+          "version": "3.2.11",
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.1"
+            },
+            "minimatch": {
+              "version": "0.3.0",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.6.4"
+                },
+                "sigmund": {
+                  "version": "1.0.1"
+                }
+              }
+            }
+          }
+        },
+        "adm-zip": {
+          "version": "0.4.4"
+        },
+        "optimist": {
+          "version": "0.6.1",
+          "dependencies": {
+            "wordwrap": {
+              "version": "0.0.3"
+            },
+            "minimist": {
+              "version": "0.0.10"
+            }
+          }
+        },
+        "q": {
+          "version": "1.0.0"
+        },
+        "source-map-support": {
+          "version": "0.2.10",
+          "dependencies": {
+            "source-map": {
+              "version": "0.1.32",
+              "dependencies": {
+                "amdefine": {
+                  "version": "0.1.0"
+                }
+              }
+            }
+          }
+        },
+        "html-entities": {
+          "version": "1.1.2"
+        },
+        "accessibility-developer-tools": {
+          "version": "2.6.0"
+        }
+      }
+    },
+    "q": {
+      "version": "1.0.1"
+    },
+    "q-io": {
+      "version": "1.12.0",
+      "dependencies": {
+        "qs": {
+          "version": "1.2.2"
+        },
+        "url2": {
+          "version": "0.0.0"
+        },
+        "mime": {
+          "version": "1.3.4"
+        },
+        "mimeparse": {
+          "version": "0.1.4"
+        },
+        "collections": {
+          "version": "0.2.2",
+          "dependencies": {
+            "weak-map": {
+              "version": "1.0.0"
+            }
+          }
+        }
+      }
+    },
+    "qq": {
+      "version": "0.3.5",
+      "dependencies": {
+        "q": {
+          "version": "0.8.4"
+        }
+      }
+    },
+    "rewire": {
+      "version": "2.1.5"
+    },
+    "semver": {
+      "version": "4.0.3"
+    },
+    "shelljs": {
+      "version": "0.3.0"
+    },
+    "sorted-object": {
+      "version": "1.0.0"
+    },
+    "stringmap": {
+      "version": "0.2.2"
+    }
+  },
+  "name": "angularjs"
+}
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 00d61c67a7f4..61fbbe68cf40 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,437 +1,2045 @@
 {
+  "name": "angularjs",
   "dependencies": {
     "angular-benchpress": {
-      "version": "0.1.3",
+      "version": "0.2.2",
+      "from": "https://registry.npmjs.org/angular-benchpress/-/angular-benchpress-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/angular-benchpress/-/angular-benchpress-0.2.2.tgz",
       "dependencies": {
         "bootstrap": {
-          "version": "3.2.0"
+          "version": "3.3.4",
+          "from": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.4.tgz",
+          "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.4.tgz"
         },
         "express": {
-          "version": "4.9.4",
+          "version": "4.12.3",
+          "from": "https://registry.npmjs.org/express/-/express-4.12.3.tgz",
+          "resolved": "https://registry.npmjs.org/express/-/express-4.12.3.tgz",
           "dependencies": {
             "accepts": {
-              "version": "1.1.0",
+              "version": "1.2.5",
+              "from": "https://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz",
+              "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz",
               "dependencies": {
                 "mime-types": {
-                  "version": "2.0.1",
+                  "version": "2.0.10",
+                  "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
                   "dependencies": {
                     "mime-db": {
-                      "version": "1.0.1"
+                      "version": "1.8.0",
+                      "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
                     }
                   }
                 },
                 "negotiator": {
-                  "version": "0.4.7"
+                  "version": "0.5.1",
+                  "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz",
+                  "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz"
                 }
               }
             },
+            "content-disposition": {
+              "version": "0.5.0",
+              "from": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"
+            },
+            "content-type": {
+              "version": "1.0.1",
+              "from": "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"
+            },
+            "cookie": {
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"
+            },
             "cookie-signature": {
-              "version": "1.0.5"
+              "version": "1.0.6",
+              "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+              "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
             },
             "debug": {
-              "version": "2.0.0",
+              "version": "2.1.3",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "dependencies": {
                 "ms": {
-                  "version": "0.6.2"
+                  "version": "0.7.0",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
-              "version": "0.4.5"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
             },
             "escape-html": {
-              "version": "1.0.1"
+              "version": "1.0.1",
+              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             },
             "etag": {
-              "version": "1.3.1",
+              "version": "1.5.1",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "dependencies": {
                 "crc": {
-                  "version": "3.0.0"
+                  "version": "3.2.1",
+                  "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
                 }
               }
             },
             "finalhandler": {
-              "version": "0.2.0"
+              "version": "0.3.4",
+              "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.4.tgz",
+              "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.4.tgz"
             },
             "fresh": {
-              "version": "0.2.4"
+              "version": "0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
-            "media-typer": {
-              "version": "0.3.0"
+            "merge-descriptors": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"
             },
             "methods": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/methods/-/methods-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.1.tgz"
             },
             "on-finished": {
-              "version": "2.1.0",
+              "version": "2.2.0",
+              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz",
               "dependencies": {
                 "ee-first": {
-                  "version": "1.0.5"
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "parseurl": {
-              "version": "1.3.0"
+              "version": "1.3.0",
+              "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
             },
             "path-to-regexp": {
-              "version": "0.1.3"
+              "version": "0.1.3",
+              "from": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz",
+              "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"
             },
             "proxy-addr": {
-              "version": "1.0.3",
+              "version": "1.0.7",
+              "from": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.7.tgz",
+              "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.7.tgz",
               "dependencies": {
                 "forwarded": {
-                  "version": "0.1.0"
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"
                 },
                 "ipaddr.js": {
-                  "version": "0.1.3"
+                  "version": "0.1.9",
+                  "from": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz",
+                  "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz"
                 }
               }
             },
             "qs": {
-              "version": "2.2.4"
+              "version": "2.4.1",
+              "from": "https://registry.npmjs.org/qs/-/qs-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.1.tgz"
             },
             "range-parser": {
-              "version": "1.0.2"
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             },
             "send": {
-              "version": "0.9.2",
+              "version": "0.12.2",
+              "from": "https://registry.npmjs.org/send/-/send-0.12.2.tgz",
+              "resolved": "https://registry.npmjs.org/send/-/send-0.12.2.tgz",
               "dependencies": {
                 "destroy": {
-                  "version": "1.0.3"
+                  "version": "1.0.3",
+                  "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
                 },
                 "mime": {
-                  "version": "1.2.11"
+                  "version": "1.3.4",
+                  "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
                 },
                 "ms": {
-                  "version": "0.6.2"
+                  "version": "0.7.0",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "serve-static": {
-              "version": "1.6.2"
+              "version": "1.9.2",
+              "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.9.2.tgz",
+              "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.9.2.tgz"
             },
             "type-is": {
-              "version": "1.5.1",
+              "version": "1.6.1",
+              "from": "https://registry.npmjs.org/type-is/-/type-is-1.6.1.tgz",
+              "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.1.tgz",
               "dependencies": {
+                "media-typer": {
+                  "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
+                },
                 "mime-types": {
-                  "version": "2.0.1",
+                  "version": "2.0.10",
+                  "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
                   "dependencies": {
                     "mime-db": {
-                      "version": "1.0.1"
+                      "version": "1.8.0",
+                      "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
                     }
                   }
                 }
               }
             },
             "vary": {
-              "version": "1.0.0"
-            },
-            "cookie": {
-              "version": "0.1.2"
-            },
-            "merge-descriptors": {
-              "version": "0.0.2"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/vary/-/vary-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.0.tgz"
             },
             "utils-merge": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
             }
           }
         },
         "minimist": {
-          "version": "1.1.0"
+          "version": "1.1.1",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
-              "version": "0.0.8"
+              "version": "0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "rimraf": {
-          "version": "2.2.8"
-        },
-        "underscore": {
-          "version": "1.7.0"
-        }
-      }
-    },
-    "benchmark": {
-      "version": "1.0.0"
-    },
-    "bower": {
-      "version": "1.3.11",
-      "dependencies": {
-        "abbrev": {
-          "version": "1.0.5"
-        },
-        "archy": {
-          "version": "0.0.2"
-        },
-        "bower-config": {
-          "version": "0.5.2",
+          "version": "2.3.2",
+          "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
           "dependencies": {
-            "graceful-fs": {
-              "version": "2.0.3"
-            },
-            "mout": {
-              "version": "0.9.1"
-            },
-            "optimist": {
-              "version": "0.6.1",
+            "glob": {
+              "version": "4.5.3",
+              "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
-                "wordwrap": {
-                  "version": "0.0.2"
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
                 },
-                "minimist": {
-                  "version": "0.0.10"
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "2.0.4",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
                 }
               }
-            },
-            "osenv": {
-              "version": "0.0.3"
-            }
-          }
-        },
-        "bower-endpoint-parser": {
-          "version": "0.2.2"
-        },
-        "bower-json": {
-          "version": "0.4.0",
-          "dependencies": {
-            "deep-extend": {
-              "version": "0.2.11"
-            },
-            "graceful-fs": {
-              "version": "2.0.3"
-            },
-            "intersect": {
-              "version": "0.0.3"
             }
           }
         },
-        "bower-logger": {
-          "version": "0.2.2"
+        "underscore": {
+          "version": "1.8.3",
+          "from": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
         },
-        "bower-registry-client": {
-          "version": "0.2.1",
+        "di": {
+          "version": "2.0.0-pre-9",
+          "from": "https://registry.npmjs.org/di/-/di-2.0.0-pre-9.tgz",
+          "resolved": "https://registry.npmjs.org/di/-/di-2.0.0-pre-9.tgz",
           "dependencies": {
-            "async": {
-              "version": "0.2.10"
-            },
-            "graceful-fs": {
-              "version": "2.0.3"
-            },
-            "lru-cache": {
-              "version": "2.3.1"
-            },
-            "request": {
-              "version": "2.27.0",
+            "traceur": {
+              "version": "0.0.33",
+              "from": "git://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
+              "resolved": "git://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
               "dependencies": {
-                "qs": {
-                  "version": "0.6.6"
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.0"
-                },
-                "forever-agent": {
-                  "version": "0.5.2"
-                },
-                "tunnel-agent": {
-                  "version": "0.3.0"
-                },
-                "http-signature": {
-                  "version": "0.10.0",
+                "commander": {
+                  "version": "2.7.1",
+                  "from": "https://registry.npmjs.org/commander/-/commander-2.7.1.tgz",
+                  "resolved": "https://registry.npmjs.org/commander/-/commander-2.7.1.tgz",
                   "dependencies": {
-                    "assert-plus": {
-                      "version": "0.1.2"
-                    },
-                    "asn1": {
-                      "version": "0.1.11"
-                    },
-                    "ctype": {
-                      "version": "0.5.2"
+                    "graceful-readlink": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
                     }
                   }
                 },
-                "hawk": {
-                  "version": "1.0.0",
+                "q-io": {
+                  "version": "1.10.9",
+                  "from": "https://registry.npmjs.org/q-io/-/q-io-1.10.9.tgz",
+                  "resolved": "https://registry.npmjs.org/q-io/-/q-io-1.10.9.tgz",
                   "dependencies": {
-                    "hoek": {
-                      "version": "0.9.1"
+                    "q": {
+                      "version": "0.9.7",
+                      "from": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
+                      "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz"
                     },
-                    "boom": {
-                      "version": "0.4.2"
+                    "qs": {
+                      "version": "0.1.0",
+                      "from": "https://registry.npmjs.org/qs/-/qs-0.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/qs/-/qs-0.1.0.tgz"
                     },
-                    "cryptiles": {
-                      "version": "0.2.2"
+                    "url2": {
+                      "version": "0.0.0",
+                      "from": "https://registry.npmjs.org/url2/-/url2-0.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/url2/-/url2-0.0.0.tgz"
                     },
-                    "sntp": {
-                      "version": "0.2.4"
-                    }
-                  }
-                },
-                "aws-sign": {
-                  "version": "0.3.0"
-                },
-                "oauth-sign": {
-                  "version": "0.3.0"
-                },
-                "cookie-jar": {
-                  "version": "0.3.0"
-                },
-                "node-uuid": {
-                  "version": "1.4.1"
-                },
-                "mime": {
-                  "version": "1.2.11"
-                },
-                "form-data": {
-                  "version": "0.1.4",
-                  "dependencies": {
-                    "combined-stream": {
-                      "version": "0.0.5",
+                    "mime": {
+                      "version": "1.2.11",
+                      "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+                      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                    },
+                    "mimeparse": {
+                      "version": "0.1.4",
+                      "from": "https://registry.npmjs.org/mimeparse/-/mimeparse-0.1.4.tgz",
+                      "resolved": "https://registry.npmjs.org/mimeparse/-/mimeparse-0.1.4.tgz"
+                    },
+                    "collections": {
+                      "version": "0.2.2",
+                      "from": "https://registry.npmjs.org/collections/-/collections-0.2.2.tgz",
+                      "resolved": "https://registry.npmjs.org/collections/-/collections-0.2.2.tgz",
                       "dependencies": {
-                        "delayed-stream": {
-                          "version": "0.0.5"
+                        "weak-map": {
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.0.tgz"
                         }
                       }
-                    },
-                    "async": {
-                      "version": "0.9.0"
                     }
                   }
                 }
               }
             },
-            "request-replay": {
-              "version": "0.2.0"
-            },
-            "mkdirp": {
-              "version": "0.3.5"
+            "es6-shim": {
+              "version": "0.9.3",
+              "from": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.9.3.tgz",
+              "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.9.3.tgz"
             }
           }
         },
-        "cardinal": {
-          "version": "0.4.4",
+        "rx": {
+          "version": "2.3.25",
+          "from": "https://registry.npmjs.org/rx/-/rx-2.3.25.tgz",
+          "resolved": "https://registry.npmjs.org/rx/-/rx-2.3.25.tgz"
+        },
+        "browserify": {
+          "version": "7.0.3",
+          "from": "https://registry.npmjs.org/browserify/-/browserify-7.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/browserify/-/browserify-7.0.3.tgz",
           "dependencies": {
-            "redeyed": {
-              "version": "0.4.4",
+            "JSONStream": {
+              "version": "0.8.4",
+              "from": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+              "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
               "dependencies": {
-                "esprima": {
-                  "version": "1.0.4"
+                "jsonparse": {
+                  "version": "0.0.5",
+                  "from": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
+                  "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                },
+                "through": {
+                  "version": "2.3.6",
+                  "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
                 }
               }
             },
-            "ansicolors": {
-              "version": "0.2.1"
-            }
-          }
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "dependencies": {
-            "ansi-styles": {
-              "version": "1.1.0"
+            "assert": {
+              "version": "1.1.2",
+              "from": "https://registry.npmjs.org/assert/-/assert-1.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/assert/-/assert-1.1.2.tgz"
             },
-            "escape-string-regexp": {
-              "version": "1.0.2"
+            "browser-pack": {
+              "version": "3.2.0",
+              "from": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
+              "dependencies": {
+                "combine-source-map": {
+                  "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                  "dependencies": {
+                    "inline-source-map": {
+                      "version": "0.3.1",
+                      "from": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                      "dependencies": {
+                        "source-map": {
+                          "version": "0.3.0",
+                          "from": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                          "dependencies": {
+                            "amdefine": {
+                              "version": "0.1.0",
+                              "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                              "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "convert-source-map": {
+                      "version": "0.3.5",
+                      "from": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+                      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                    },
+                    "source-map": {
+                      "version": "0.1.43",
+                      "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                      "dependencies": {
+                        "amdefine": {
+                          "version": "0.1.0",
+                          "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "through2": {
+                  "version": "0.5.1",
+                  "from": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                  "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
+                }
+              }
             },
-            "has-ansi": {
-              "version": "0.1.0",
+            "browser-resolve": {
+              "version": "1.8.2",
+              "from": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.8.2.tgz",
+              "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.8.2.tgz",
               "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1"
+                "resolve": {
+                  "version": "1.1.6",
+                  "from": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz",
+                  "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
                 }
               }
             },
-            "strip-ansi": {
-              "version": "0.3.0",
+            "browserify-zlib": {
+              "version": "0.1.4",
+              "from": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+              "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
               "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1"
+                "pako": {
+                  "version": "0.2.6",
+                  "from": "https://registry.npmjs.org/pako/-/pako-0.2.6.tgz",
+                  "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.6.tgz"
                 }
               }
             },
-            "supports-color": {
-              "version": "0.2.0"
-            }
-          }
-        },
-        "chmodr": {
-          "version": "0.1.0"
-        },
-        "decompress-zip": {
-          "version": "0.0.8",
-          "dependencies": {
-            "mkpath": {
-              "version": "0.1.0"
+            "buffer": {
+              "version": "2.8.2",
+              "from": "https://registry.npmjs.org/buffer/-/buffer-2.8.2.tgz",
+              "resolved": "https://registry.npmjs.org/buffer/-/buffer-2.8.2.tgz",
+              "dependencies": {
+                "base64-js": {
+                  "version": "0.0.7",
+                  "from": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz",
+                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"
+                },
+                "ieee754": {
+                  "version": "1.1.4",
+                  "from": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz",
+                  "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz"
+                },
+                "is-array": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                }
+              }
             },
-            "binary": {
-              "version": "0.3.0",
+            "builtins": {
+              "version": "0.0.7",
+              "from": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
+              "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+            },
+            "commondir": {
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
+            },
+            "concat-stream": {
+              "version": "1.4.7",
+              "from": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz",
+              "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz",
               "dependencies": {
-                "chainsaw": {
-                  "version": "0.1.0",
+                "typedarray": {
+                  "version": "0.0.6",
+                  "from": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                   "dependencies": {
-                    "traverse": {
-                      "version": "0.3.9"
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     }
                   }
-                },
-                "buffers": {
-                  "version": "0.1.1"
                 }
               }
             },
-            "touch": {
-              "version": "0.0.2",
+            "console-browserify": {
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
               "dependencies": {
-                "nopt": {
-                  "version": "1.0.10"
+                "date-now": {
+                  "version": "0.1.4",
+                  "from": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+                  "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
                 }
               }
             },
-            "readable-stream": {
-              "version": "1.1.13",
+            "constants-browserify": {
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
+            },
+            "crypto-browserify": {
+              "version": "3.9.13",
+              "from": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.13.tgz",
+              "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.13.tgz",
               "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.1"
-                },
-                "isarray": {
-                  "version": "0.0.1"
-                },
-                "string_decoder": {
-                  "version": "0.10.31"
+                "browserify-aes": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz"
                 },
-                "inherits": {
-                  "version": "2.0.1"
-                }
-              }
-            },
+                "browserify-sign": {
+                  "version": "2.8.0",
+                  "from": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-2.8.0.tgz",
+                  "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-2.8.0.tgz",
+                  "dependencies": {
+                    "bn.js": {
+                      "version": "1.3.0",
+                      "from": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                    },
+                    "browserify-rsa": {
+                      "version": "1.1.1",
+                      "from": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-1.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-1.1.1.tgz"
+                    },
+                    "elliptic": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                      "dependencies": {
+                        "brorand": {
+                          "version": "1.0.5",
+                          "from": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz",
+                          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                        },
+                        "hash.js": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "parse-asn1": {
+                      "version": "2.0.0",
+                      "from": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-2.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-2.0.0.tgz",
+                      "dependencies": {
+                        "asn1.js": {
+                          "version": "1.0.3",
+                          "from": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz",
+                          "dependencies": {
+                            "minimalistic-assert": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                            }
+                          }
+                        },
+                        "asn1.js-rfc3280": {
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/asn1.js-rfc3280/-/asn1.js-rfc3280-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/asn1.js-rfc3280/-/asn1.js-rfc3280-1.0.0.tgz"
+                        },
+                        "pemstrip": {
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/pemstrip/-/pemstrip-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/pemstrip/-/pemstrip-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "create-ecdh": {
+                  "version": "2.0.0",
+                  "from": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.0.tgz",
+                  "dependencies": {
+                    "bn.js": {
+                      "version": "1.3.0",
+                      "from": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                    },
+                    "elliptic": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                      "dependencies": {
+                        "brorand": {
+                          "version": "1.0.5",
+                          "from": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz",
+                          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                        },
+                        "hash.js": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "create-hash": {
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.1.tgz",
+                  "dependencies": {
+                    "ripemd160": {
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.0.tgz"
+                    },
+                    "sha.js": {
+                      "version": "2.3.6",
+                      "from": "https://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz",
+                      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz"
+                    }
+                  }
+                },
+                "create-hmac": {
+                  "version": "1.1.3",
+                  "from": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz",
+                  "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz"
+                },
+                "diffie-hellman": {
+                  "version": "3.0.1",
+                  "from": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz",
+                  "dependencies": {
+                    "bn.js": {
+                      "version": "1.3.0",
+                      "from": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                    },
+                    "miller-rabin": {
+                      "version": "1.1.5",
+                      "from": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz",
+                      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz",
+                      "dependencies": {
+                        "brorand": {
+                          "version": "1.0.5",
+                          "from": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz",
+                          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "pbkdf2-compat": {
+                  "version": "3.0.2",
+                  "from": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"
+                },
+                "public-encrypt": {
+                  "version": "2.0.0",
+                  "from": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.0.tgz",
+                  "dependencies": {
+                    "bn.js": {
+                      "version": "1.3.0",
+                      "from": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                    },
+                    "browserify-rsa": {
+                      "version": "2.0.0",
+                      "from": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz"
+                    },
+                    "parse-asn1": {
+                      "version": "3.0.0",
+                      "from": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
+                      "dependencies": {
+                        "asn1.js": {
+                          "version": "1.0.3",
+                          "from": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz",
+                          "dependencies": {
+                            "minimalistic-assert": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "randombytes": {
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"
+                }
+              }
+            },
+            "deep-equal": {
+              "version": "0.2.2",
+              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
+            },
+            "defined": {
+              "version": "0.0.0",
+              "from": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+            },
+            "deps-sort": {
+              "version": "1.3.5",
+              "from": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz",
+              "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
+                },
+                "through2": {
+                  "version": "0.5.1",
+                  "from": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                  "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
+                }
+              }
+            },
+            "domain-browser": {
+              "version": "1.1.4",
+              "from": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz",
+              "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+            },
+            "duplexer2": {
+              "version": "0.0.2",
+              "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "events": {
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/events/-/events-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
+            },
+            "glob": {
+              "version": "4.5.3",
+              "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.4",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "http-browserify": {
+              "version": "1.7.0",
+              "from": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+              "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+              "dependencies": {
+                "Base64": {
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+                }
+              }
+            },
+            "https-browserify": {
+              "version": "0.0.0",
+              "from": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            },
+            "insert-module-globals": {
+              "version": "6.2.1",
+              "from": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.1.tgz",
+              "dependencies": {
+                "JSONStream": {
+                  "version": "0.7.4",
+                  "from": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+                  "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+                  "dependencies": {
+                    "jsonparse": {
+                      "version": "0.0.5",
+                      "from": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                    }
+                  }
+                },
+                "combine-source-map": {
+                  "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                  "dependencies": {
+                    "inline-source-map": {
+                      "version": "0.3.1",
+                      "from": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                      "dependencies": {
+                        "source-map": {
+                          "version": "0.3.0",
+                          "from": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                          "dependencies": {
+                            "amdefine": {
+                              "version": "0.1.0",
+                              "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                              "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "convert-source-map": {
+                      "version": "0.3.5",
+                      "from": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+                      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                    },
+                    "source-map": {
+                      "version": "0.1.43",
+                      "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                      "dependencies": {
+                        "amdefine": {
+                          "version": "0.1.0",
+                          "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lexical-scope": {
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz",
+                  "dependencies": {
+                    "astw": {
+                      "version": "1.1.0",
+                      "from": "https://registry.npmjs.org/astw/-/astw-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/astw/-/astw-1.1.0.tgz",
+                      "dependencies": {
+                        "esprima-fb": {
+                          "version": "3001.1.0-dev-harmony-fb",
+                          "from": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz",
+                          "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "process": {
+                  "version": "0.6.0",
+                  "from": "https://registry.npmjs.org/process/-/process-0.6.0.tgz",
+                  "resolved": "https://registry.npmjs.org/process/-/process-0.6.0.tgz"
+                },
+                "through": {
+                  "version": "2.3.6",
+                  "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
+                }
+              }
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+            },
+            "labeled-stream-splicer": {
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+              "dependencies": {
+                "stream-splicer": {
+                  "version": "1.3.1",
+                  "from": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "readable-wrap": {
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                    },
+                    "indexof": {
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "module-deps": {
+              "version": "3.7.5",
+              "from": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.5.tgz",
+              "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.5.tgz",
+              "dependencies": {
+                "JSONStream": {
+                  "version": "0.7.4",
+                  "from": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+                  "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+                  "dependencies": {
+                    "jsonparse": {
+                      "version": "0.0.5",
+                      "from": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                    },
+                    "through": {
+                      "version": "2.3.6",
+                      "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
+                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
+                    }
+                  }
+                },
+                "detective": {
+                  "version": "4.0.0",
+                  "from": "https://registry.npmjs.org/detective/-/detective-4.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/detective/-/detective-4.0.0.tgz",
+                  "dependencies": {
+                    "acorn": {
+                      "version": "0.9.0",
+                      "from": "https://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz",
+                      "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz"
+                    },
+                    "escodegen": {
+                      "version": "1.6.1",
+                      "from": "https://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz",
+                      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz",
+                      "dependencies": {
+                        "estraverse": {
+                          "version": "1.9.3",
+                          "from": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+                          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
+                        },
+                        "esutils": {
+                          "version": "1.1.6",
+                          "from": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
+                          "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
+                        },
+                        "esprima": {
+                          "version": "1.2.5",
+                          "from": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz",
+                          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
+                        },
+                        "optionator": {
+                          "version": "0.5.0",
+                          "from": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
+                          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
+                          "dependencies": {
+                            "prelude-ls": {
+                              "version": "1.1.1",
+                              "from": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz",
+                              "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz"
+                            },
+                            "deep-is": {
+                              "version": "0.1.3",
+                              "from": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+                              "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
+                            },
+                            "wordwrap": {
+                              "version": "0.0.2",
+                              "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+                              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                            },
+                            "type-check": {
+                              "version": "0.3.1",
+                              "from": "https://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz",
+                              "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"
+                            },
+                            "levn": {
+                              "version": "0.2.5",
+                              "from": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
+                              "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"
+                            },
+                            "fast-levenshtein": {
+                              "version": "1.0.6",
+                              "from": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz",
+                              "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz"
+                            }
+                          }
+                        },
+                        "source-map": {
+                          "version": "0.1.43",
+                          "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                          "dependencies": {
+                            "amdefine": {
+                              "version": "0.1.0",
+                              "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                              "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimist": {
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
+                },
+                "parents": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+                  "dependencies": {
+                    "path-platform": {
+                      "version": "0.11.15",
+                      "from": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+                      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
+                    }
+                  }
+                },
+                "resolve": {
+                  "version": "1.1.6",
+                  "from": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz",
+                  "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
+                },
+                "stream-combiner2": {
+                  "version": "1.0.2",
+                  "from": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+                  "dependencies": {
+                    "through2": {
+                      "version": "0.5.1",
+                      "from": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                      "dependencies": {
+                        "xtend": {
+                          "version": "3.0.0",
+                          "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "subarg": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.10",
+                      "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                    }
+                  }
+                },
+                "through2": {
+                  "version": "0.4.2",
+                  "from": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+                  "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+                  "dependencies": {
+                    "xtend": {
+                      "version": "2.1.2",
+                      "from": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+                      "dependencies": {
+                        "object-keys": {
+                          "version": "0.4.0",
+                          "from": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+                          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "os-browserify": {
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
+            },
+            "parents": {
+              "version": "0.0.3",
+              "from": "https://registry.npmjs.org/parents/-/parents-0.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/parents/-/parents-0.0.3.tgz",
+              "dependencies": {
+                "path-platform": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz"
+                }
+              }
+            },
+            "path-browserify": {
+              "version": "0.0.0",
+              "from": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
+            },
+            "process": {
+              "version": "0.8.0",
+              "from": "https://registry.npmjs.org/process/-/process-0.8.0.tgz",
+              "resolved": "https://registry.npmjs.org/process/-/process-0.8.0.tgz"
+            },
+            "punycode": {
+              "version": "1.2.4",
+              "from": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"
+            },
+            "querystring-es3": {
+              "version": "0.2.1",
+              "from": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                }
+              }
+            },
+            "resolve": {
+              "version": "0.7.4",
+              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
+              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
+            },
+            "shallow-copy": {
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
+            },
+            "shasum": {
+              "version": "1.0.1",
+              "from": "https://registry.npmjs.org/shasum/-/shasum-1.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.1.tgz",
+              "dependencies": {
+                "json-stable-stringify": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+                  "dependencies": {
+                    "jsonify": {
+                      "version": "0.0.0",
+                      "from": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+                    }
+                  }
+                },
+                "sha.js": {
+                  "version": "2.3.6",
+                  "from": "https://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz",
+                  "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz"
+                }
+              }
+            },
+            "shell-quote": {
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"
+            },
+            "stream-browserify": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+            },
+            "subarg": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"
+            },
+            "syntax-error": {
+              "version": "1.1.2",
+              "from": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz",
+              "dependencies": {
+                "acorn": {
+                  "version": "0.9.0",
+                  "from": "https://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz",
+                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "timers-browserify": {
+              "version": "1.4.0",
+              "from": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.0.tgz",
+              "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.0.tgz",
+              "dependencies": {
+                "process": {
+                  "version": "0.10.1",
+                  "from": "https://registry.npmjs.org/process/-/process-0.10.1.tgz",
+                  "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz"
+                }
+              }
+            },
+            "tty-browserify": {
+              "version": "0.0.0",
+              "from": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+            },
+            "umd": {
+              "version": "2.1.0",
+              "from": "https://registry.npmjs.org/umd/-/umd-2.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/umd/-/umd-2.1.0.tgz",
+              "dependencies": {
+                "rfile": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz",
+                  "dependencies": {
+                    "callsite": {
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
+                    },
+                    "resolve": {
+                      "version": "0.3.1",
+                      "from": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz"
+                    }
+                  }
+                },
+                "ruglify": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz",
+                  "dependencies": {
+                    "uglify-js": {
+                      "version": "2.2.5",
+                      "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
+                      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
+                      "dependencies": {
+                        "source-map": {
+                          "version": "0.1.43",
+                          "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                          "dependencies": {
+                            "amdefine": {
+                              "version": "0.1.0",
+                              "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                              "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                            }
+                          }
+                        },
+                        "optimist": {
+                          "version": "0.3.7",
+                          "from": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+                          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+                          "dependencies": {
+                            "wordwrap": {
+                              "version": "0.0.2",
+                              "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+                              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "through": {
+                  "version": "2.3.6",
+                  "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
+                },
+                "uglify-js": {
+                  "version": "2.4.19",
+                  "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.19.tgz",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.19.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.2.10",
+                      "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+                      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+                    },
+                    "source-map": {
+                      "version": "0.1.34",
+                      "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+                      "dependencies": {
+                        "amdefine": {
+                          "version": "0.1.0",
+                          "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                        }
+                      }
+                    },
+                    "yargs": {
+                      "version": "3.5.4",
+                      "from": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                        },
+                        "decamelize": {
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
+                        },
+                        "window-size": {
+                          "version": "0.1.0",
+                          "from": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+                        },
+                        "wordwrap": {
+                          "version": "0.0.2",
+                          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                        }
+                      }
+                    },
+                    "uglify-to-browserify": {
+                      "version": "1.0.2",
+                      "from": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "url": {
+              "version": "0.10.3",
+              "from": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+              "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+              "dependencies": {
+                "punycode": {
+                  "version": "1.3.2",
+                  "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                },
+                "querystring": {
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+                }
+              }
+            },
+            "util": {
+              "version": "0.10.3",
+              "from": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+              "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
+            },
+            "vm-browserify": {
+              "version": "0.0.4",
+              "from": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+              "dependencies": {
+                "indexof": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                }
+              }
+            },
+            "xtend": {
+              "version": "3.0.0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+            }
+          }
+        }
+      }
+    },
+    "benchmark": {
+      "version": "1.0.0",
+      "from": "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"
+    },
+    "bower": {
+      "version": "1.3.12",
+      "from": "https://registry.npmjs.org/bower/-/bower-1.3.12.tgz",
+      "resolved": "https://registry.npmjs.org/bower/-/bower-1.3.12.tgz",
+      "dependencies": {
+        "abbrev": {
+          "version": "1.0.5",
+          "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+        },
+        "archy": {
+          "version": "0.0.2",
+          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
+        },
+        "bower-config": {
+          "version": "0.5.2",
+          "from": "https://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz",
+          "resolved": "https://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz",
+          "dependencies": {
+            "graceful-fs": {
+              "version": "2.0.3",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+            },
+            "optimist": {
+              "version": "0.6.1",
+              "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+              "dependencies": {
+                "wordwrap": {
+                  "version": "0.0.2",
+                  "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                },
+                "minimist": {
+                  "version": "0.0.10",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                }
+              }
+            },
+            "osenv": {
+              "version": "0.0.3",
+              "from": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"
+            }
+          }
+        },
+        "bower-endpoint-parser": {
+          "version": "0.2.2",
+          "from": "https://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz"
+        },
+        "bower-json": {
+          "version": "0.4.0",
+          "from": "https://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz",
+          "dependencies": {
+            "deep-extend": {
+              "version": "0.2.11",
+              "from": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz",
+              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+            },
+            "graceful-fs": {
+              "version": "2.0.3",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+            },
+            "intersect": {
+              "version": "0.0.3",
+              "from": "https://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz"
+            }
+          }
+        },
+        "bower-logger": {
+          "version": "0.2.2",
+          "from": "https://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz"
+        },
+        "bower-registry-client": {
+          "version": "0.2.4",
+          "from": "https://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.4.tgz",
+          "resolved": "https://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.4.tgz",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10",
+              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+            },
+            "graceful-fs": {
+              "version": "2.0.3",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+            },
+            "lru-cache": {
+              "version": "2.3.1",
+              "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"
+            },
+            "request": {
+              "version": "2.51.0",
+              "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4",
+                  "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.8.0",
+                  "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.5.2",
+                  "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                },
+                "form-data": {
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.9.0",
+                      "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+                      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                    },
+                    "mime-types": {
+                      "version": "2.0.10",
+                      "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.8.0",
+                          "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.0",
+                  "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                },
+                "mime-types": {
+                  "version": "1.0.2",
+                  "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.4.3",
+                  "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                },
+                "qs": {
+                  "version": "2.3.3",
+                  "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.0",
+                  "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                },
+                "tough-cookie": {
+                  "version": "0.12.1",
+                  "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                  "dependencies": {
+                    "punycode": {
+                      "version": "1.3.2",
+                      "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                    }
+                  }
+                },
+                "http-signature": {
+                  "version": "0.10.1",
+                  "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5",
+                      "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                    },
+                    "asn1": {
+                      "version": "0.1.11",
+                      "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                    },
+                    "ctype": {
+                      "version": "0.5.3",
+                      "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.5.0",
+                  "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+                },
+                "hawk": {
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1",
+                      "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                    },
+                    "boom": {
+                      "version": "0.4.2",
+                      "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2",
+                      "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                    },
+                    "sntp": {
+                      "version": "0.2.4",
+                      "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0",
+                  "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.4",
+                  "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                },
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5",
+                      "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "request-replay": {
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz"
+            },
+            "mkdirp": {
+              "version": "0.3.5",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+            }
+          }
+        },
+        "cardinal": {
+          "version": "0.4.0",
+          "from": "https://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz",
+          "dependencies": {
+            "redeyed": {
+              "version": "0.4.4",
+              "from": "https://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz",
+              "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz",
+              "dependencies": {
+                "esprima": {
+                  "version": "1.0.4",
+                  "from": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
+                }
+              }
+            }
+          }
+        },
+        "chalk": {
+          "version": "0.5.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+            }
+          }
+        },
+        "chmodr": {
+          "version": "0.1.0",
+          "from": "https://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz"
+        },
+        "decompress-zip": {
+          "version": "0.0.8",
+          "from": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz",
+          "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz",
+          "dependencies": {
+            "mkpath": {
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"
+            },
+            "binary": {
+              "version": "0.3.0",
+              "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+              "dependencies": {
+                "chainsaw": {
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+                  "dependencies": {
+                    "traverse": {
+                      "version": "0.3.9",
+                      "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                    }
+                  }
+                },
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            },
+            "touch": {
+              "version": "0.0.2",
+              "from": "https://registry.npmjs.org/touch/-/touch-0.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.2.tgz",
+              "dependencies": {
+                "nopt": {
+                  "version": "1.0.10",
+                  "from": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
             "nopt": {
-              "version": "2.2.1"
+              "version": "2.2.1",
+              "from": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"
             }
           }
         },
         "fstream": {
-          "version": "1.0.2",
+          "version": "1.0.4",
+          "from": "https://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz",
           "dependencies": {
             "inherits": {
-              "version": "2.0.1"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "fstream-ignore": {
-          "version": "1.0.1",
+          "version": "1.0.2",
+          "from": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz",
           "dependencies": {
             "inherits": {
-              "version": "2.0.1"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "minimatch": {
-              "version": "1.0.0",
+              "version": "2.0.4",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
               "dependencies": {
-                "sigmund": {
-                  "version": "1.0.0"
+                "brace-expansion": {
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.2.0",
+                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                    },
+                    "concat-map": {
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                    }
+                  }
                 }
               }
             }
@@ -439,53 +2047,81 @@
         },
         "glob": {
           "version": "4.0.6",
+          "from": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
           "dependencies": {
             "inherits": {
-              "version": "2.0.1"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "minimatch": {
               "version": "1.0.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
               "dependencies": {
                 "sigmund": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "once": {
               "version": "1.3.1",
+              "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
               "dependencies": {
                 "wrappy": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
             }
           }
         },
         "graceful-fs": {
-          "version": "3.0.2"
+          "version": "3.0.6",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
         },
         "handlebars": {
           "version": "2.0.0",
+          "from": "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz",
           "dependencies": {
             "optimist": {
               "version": "0.3.7",
+              "from": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
               "dependencies": {
                 "wordwrap": {
-                  "version": "0.0.2"
+                  "version": "0.0.2",
+                  "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
                 }
               }
             },
             "uglify-js": {
               "version": "2.3.6",
+              "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz",
+              "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz",
               "dependencies": {
                 "async": {
-                  "version": "0.2.10"
+                  "version": "0.2.10",
+                  "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
                 },
                 "source-map": {
-                  "version": "0.1.39",
+                  "version": "0.1.43",
+                  "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                   "dependencies": {
                     "amdefine": {
-                      "version": "0.1.0"
+                      "version": "0.1.0",
+                      "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
                     }
                   }
                 }
@@ -494,291 +2130,535 @@
           }
         },
         "inquirer": {
-          "version": "0.7.3",
+          "version": "0.7.1",
+          "from": "https://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz",
           "dependencies": {
-            "ansi-regex": {
-              "version": "1.1.0"
-            },
             "cli-color": {
-              "version": "0.3.2",
+              "version": "0.3.3",
+              "from": "https://registry.npmjs.org/cli-color/-/cli-color-0.3.3.tgz",
+              "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-0.3.3.tgz",
               "dependencies": {
                 "d": {
-                  "version": "0.1.1"
+                  "version": "0.1.1",
+                  "from": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz"
                 },
                 "es5-ext": {
-                  "version": "0.10.4",
+                  "version": "0.10.6",
+                  "from": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz",
+                  "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz",
                   "dependencies": {
                     "es6-iterator": {
-                      "version": "0.1.1"
+                      "version": "0.1.3",
+                      "from": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz"
                     },
                     "es6-symbol": {
-                      "version": "0.1.0"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz"
                     }
                   }
                 },
                 "memoizee": {
-                  "version": "0.3.7",
+                  "version": "0.3.8",
+                  "from": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz",
+                  "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz",
                   "dependencies": {
+                    "es6-weak-map": {
+                      "version": "0.1.2",
+                      "from": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz",
+                      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz",
+                      "dependencies": {
+                        "es6-iterator": {
+                          "version": "0.1.3",
+                          "from": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                          "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                          "dependencies": {
+                            "es6-symbol": {
+                              "version": "2.0.1",
+                              "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz"
+                            }
+                          }
+                        },
+                        "es6-symbol": {
+                          "version": "0.1.1",
+                          "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz"
+                        }
+                      }
+                    },
                     "event-emitter": {
-                      "version": "0.3.1"
+                      "version": "0.3.3",
+                      "from": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz",
+                      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz"
                     },
                     "lru-queue": {
-                      "version": "0.1.0"
+                      "version": "0.1.0",
+                      "from": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"
                     },
                     "next-tick": {
-                      "version": "0.2.2"
+                      "version": "0.2.2",
+                      "from": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
+                      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"
                     }
                   }
                 },
                 "timers-ext": {
                   "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz",
                   "dependencies": {
                     "next-tick": {
-                      "version": "0.2.2"
+                      "version": "0.2.2",
+                      "from": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
+                      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"
                     }
                   }
                 }
               }
             },
             "figures": {
-              "version": "1.3.3"
+              "version": "1.3.5",
+              "from": "https://registry.npmjs.org/figures/-/figures-1.3.5.tgz",
+              "resolved": "https://registry.npmjs.org/figures/-/figures-1.3.5.tgz"
             },
             "mute-stream": {
-              "version": "0.0.4"
+              "version": "0.0.4",
+              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             },
             "readline2": {
-              "version": "0.1.0",
+              "version": "0.1.1",
+              "from": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
               "dependencies": {
-                "chalk": {
-                  "version": "0.4.0",
+                "strip-ansi": {
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "dependencies": {
-                    "has-color": {
-                      "version": "0.1.7"
-                    },
-                    "ansi-styles": {
-                      "version": "1.0.0"
-                    },
-                    "strip-ansi": {
-                      "version": "0.1.1"
+                    "ansi-regex": {
+                      "version": "1.1.1",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     }
                   }
                 }
               }
             },
             "rx": {
-              "version": "2.3.10"
+              "version": "2.4.9",
+              "from": "https://registry.npmjs.org/rx/-/rx-2.4.9.tgz",
+              "resolved": "https://registry.npmjs.org/rx/-/rx-2.4.9.tgz"
             },
             "through": {
-              "version": "2.3.6"
+              "version": "2.3.6",
+              "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
+              "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
             }
           }
         },
         "insight": {
           "version": "0.4.3",
+          "from": "https://registry.npmjs.org/insight/-/insight-0.4.3.tgz",
+          "resolved": "https://registry.npmjs.org/insight/-/insight-0.4.3.tgz",
           "dependencies": {
             "async": {
-              "version": "0.9.0"
+              "version": "0.9.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+            },
+            "chalk": {
+              "version": "0.5.1",
+              "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3",
+                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                },
+                "has-ansi": {
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.2.1",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "0.2.1",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+                }
+              }
             },
             "configstore": {
-              "version": "0.3.1",
+              "version": "0.3.2",
+              "from": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz",
+              "resolved": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz",
               "dependencies": {
                 "js-yaml": {
-                  "version": "3.0.2",
+                  "version": "3.2.7",
+                  "from": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz",
+                  "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz",
                   "dependencies": {
                     "argparse": {
-                      "version": "0.1.15",
+                      "version": "1.0.2",
+                      "from": "https://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz",
                       "dependencies": {
-                        "underscore": {
-                          "version": "1.4.4"
+                        "lodash": {
+                          "version": "3.6.0",
+                          "from": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz"
                         },
-                        "underscore.string": {
-                          "version": "2.3.3"
+                        "sprintf-js": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz"
                         }
                       }
                     },
                     "esprima": {
-                      "version": "1.0.4"
+                      "version": "2.0.0",
+                      "from": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz"
                     }
                   }
                 },
                 "object-assign": {
-                  "version": "0.3.1"
+                  "version": "2.0.0",
+                  "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
+                },
+                "user-home": {
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
                 },
                 "uuid": {
-                  "version": "1.4.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"
+                },
+                "xdg-basedir": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz"
                 }
               }
             },
             "inquirer": {
               "version": "0.6.0",
+              "from": "https://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz",
+              "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz",
               "dependencies": {
                 "cli-color": {
-                  "version": "0.3.2",
+                  "version": "0.3.3",
+                  "from": "https://registry.npmjs.org/cli-color/-/cli-color-0.3.3.tgz",
+                  "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-0.3.3.tgz",
                   "dependencies": {
                     "d": {
-                      "version": "0.1.1"
+                      "version": "0.1.1",
+                      "from": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz"
                     },
                     "es5-ext": {
-                      "version": "0.10.4",
+                      "version": "0.10.6",
+                      "from": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz",
+                      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz",
                       "dependencies": {
                         "es6-iterator": {
-                          "version": "0.1.1"
+                          "version": "0.1.3",
+                          "from": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                          "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz"
+                        },
+                        "es6-symbol": {
+                          "version": "2.0.1",
+                          "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz"
+                        }
+                      }
+                    },
+                    "memoizee": {
+                      "version": "0.3.8",
+                      "from": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz",
+                      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz",
+                      "dependencies": {
+                        "es6-weak-map": {
+                          "version": "0.1.2",
+                          "from": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz",
+                          "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz",
+                          "dependencies": {
+                            "es6-iterator": {
+                              "version": "0.1.3",
+                              "from": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                              "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                              "dependencies": {
+                                "es6-symbol": {
+                                  "version": "2.0.1",
+                                  "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "es6-symbol": {
+                              "version": "0.1.1",
+                              "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz",
+                              "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz"
+                            }
+                          }
                         },
-                        "es6-symbol": {
-                          "version": "0.1.0"
-                        }
-                      }
-                    },
-                    "memoizee": {
-                      "version": "0.3.7",
-                      "dependencies": {
                         "event-emitter": {
-                          "version": "0.3.1"
+                          "version": "0.3.3",
+                          "from": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz",
+                          "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz"
                         },
                         "lru-queue": {
-                          "version": "0.1.0"
+                          "version": "0.1.0",
+                          "from": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"
                         },
                         "next-tick": {
-                          "version": "0.2.2"
+                          "version": "0.2.2",
+                          "from": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
+                          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"
                         }
                       }
                     },
                     "timers-ext": {
                       "version": "0.1.0",
+                      "from": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz",
                       "dependencies": {
                         "next-tick": {
-                          "version": "0.2.2"
+                          "version": "0.2.2",
+                          "from": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
+                          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"
                         }
                       }
                     }
                   }
                 },
                 "mute-stream": {
-                  "version": "0.0.4"
+                  "version": "0.0.4",
+                  "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
                 },
                 "readline2": {
-                  "version": "0.1.0",
+                  "version": "0.1.1",
+                  "from": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
                   "dependencies": {
-                    "chalk": {
-                      "version": "0.4.0",
+                    "strip-ansi": {
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                       "dependencies": {
-                        "has-color": {
-                          "version": "0.1.7"
-                        },
-                        "ansi-styles": {
-                          "version": "1.0.0"
-                        },
-                        "strip-ansi": {
-                          "version": "0.1.1"
+                        "ansi-regex": {
+                          "version": "1.1.1",
+                          "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "rx": {
-                  "version": "2.3.10"
+                  "version": "2.4.9",
+                  "from": "https://registry.npmjs.org/rx/-/rx-2.4.9.tgz",
+                  "resolved": "https://registry.npmjs.org/rx/-/rx-2.4.9.tgz"
                 },
                 "through": {
-                  "version": "2.3.6"
+                  "version": "2.3.6",
+                  "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
                 }
               }
             },
             "lodash.debounce": {
               "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz",
               "dependencies": {
                 "lodash.isfunction": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"
                 },
                 "lodash.isobject": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                   "dependencies": {
                     "lodash._objecttypes": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.now": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     }
                   }
                 }
               }
             },
             "object-assign": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"
             },
             "os-name": {
-              "version": "1.0.0",
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz",
               "dependencies": {
-                "minimist": {
-                  "version": "1.1.0"
-                },
                 "osx-release": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/osx-release/-/osx-release-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/osx-release/-/osx-release-1.0.0.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "1.1.1",
+                      "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+                    }
+                  }
+                },
+                "win-release": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/win-release/-/win-release-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.0.0.tgz"
                 }
               }
             },
             "tough-cookie": {
               "version": "0.12.1",
+              "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
               "dependencies": {
                 "punycode": {
-                  "version": "1.3.1"
+                  "version": "1.3.2",
+                  "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
                 }
               }
             }
           }
         },
         "is-root": {
-          "version": "1.0.0"
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"
         },
         "junk": {
-          "version": "1.0.0"
+          "version": "1.0.1",
+          "from": "https://registry.npmjs.org/junk/-/junk-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/junk/-/junk-1.0.1.tgz"
         },
         "lockfile": {
-          "version": "1.0.0"
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz"
         },
         "lru-cache": {
-          "version": "2.5.0"
+          "version": "2.5.0",
+          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
-              "version": "0.0.8"
+              "version": "0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "mout": {
-          "version": "0.10.0"
+          "version": "0.9.1",
+          "from": "https://registry.npmjs.org/mout/-/mout-0.9.1.tgz",
+          "resolved": "https://registry.npmjs.org/mout/-/mout-0.9.1.tgz"
         },
         "nopt": {
-          "version": "3.0.1"
+          "version": "3.0.1",
+          "from": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"
         },
         "opn": {
-          "version": "1.0.0"
+          "version": "1.0.1",
+          "from": "https://registry.npmjs.org/opn/-/opn-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/opn/-/opn-1.0.1.tgz"
         },
         "osenv": {
-          "version": "0.1.0"
+          "version": "0.1.0",
+          "from": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"
         },
         "p-throttler": {
           "version": "0.1.0",
+          "from": "https://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz",
           "dependencies": {
             "q": {
-              "version": "0.9.7"
+              "version": "0.9.7",
+              "from": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
+              "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz"
             }
           }
         },
         "promptly": {
           "version": "0.2.0",
+          "from": "https://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz",
           "dependencies": {
             "read": {
               "version": "1.0.5",
+              "from": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
+              "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
               "dependencies": {
                 "mute-stream": {
-                  "version": "0.0.4"
+                  "version": "0.0.4",
+                  "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
                 }
               }
             }
@@ -786,173 +2666,273 @@
         },
         "request": {
           "version": "2.42.0",
+          "from": "https://registry.npmjs.org/request/-/request-2.42.0.tgz",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.42.0.tgz",
           "dependencies": {
             "bl": {
-              "version": "0.9.3",
+              "version": "0.9.4",
+              "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
               "dependencies": {
                 "readable-stream": {
-                  "version": "1.0.32",
+                  "version": "1.0.33",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 }
               }
             },
             "caseless": {
-              "version": "0.6.0"
+              "version": "0.6.0",
+              "from": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
             },
             "forever-agent": {
-              "version": "0.5.2"
+              "version": "0.5.2",
+              "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
             },
             "qs": {
-              "version": "1.2.2"
+              "version": "1.2.2",
+              "from": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"
             },
             "json-stringify-safe": {
-              "version": "5.0.0"
+              "version": "5.0.0",
+              "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
             },
             "mime-types": {
-              "version": "1.0.2"
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
             },
             "node-uuid": {
-              "version": "1.4.1"
+              "version": "1.4.3",
+              "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
             },
             "tunnel-agent": {
-              "version": "0.4.0"
+              "version": "0.4.0",
+              "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
             },
             "tough-cookie": {
               "version": "0.12.1",
+              "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
               "dependencies": {
                 "punycode": {
-                  "version": "1.3.1"
+                  "version": "1.3.2",
+                  "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
                 }
               }
             },
             "form-data": {
               "version": "0.1.4",
+              "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
               "dependencies": {
                 "combined-stream": {
-                  "version": "0.0.5",
+                  "version": "0.0.7",
+                  "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
                   "dependencies": {
                     "delayed-stream": {
-                      "version": "0.0.5"
+                      "version": "0.0.5",
+                      "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                     }
                   }
                 },
                 "mime": {
-                  "version": "1.2.11"
+                  "version": "1.2.11",
+                  "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                 },
                 "async": {
-                  "version": "0.9.0"
+                  "version": "0.9.0",
+                  "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
                 }
               }
             },
             "http-signature": {
-              "version": "0.10.0",
+              "version": "0.10.1",
+              "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
               "dependencies": {
                 "assert-plus": {
-                  "version": "0.1.2"
+                  "version": "0.1.5",
+                  "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
                 },
                 "asn1": {
-                  "version": "0.1.11"
+                  "version": "0.1.11",
+                  "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
                 },
                 "ctype": {
-                  "version": "0.5.2"
+                  "version": "0.5.3",
+                  "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
                 }
               }
             },
             "oauth-sign": {
-              "version": "0.4.0"
+              "version": "0.4.0",
+              "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
             },
             "hawk": {
               "version": "1.1.1",
+              "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
               "dependencies": {
                 "hoek": {
-                  "version": "0.9.1"
+                  "version": "0.9.1",
+                  "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
                 },
                 "boom": {
-                  "version": "0.4.2"
+                  "version": "0.4.2",
+                  "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
                 },
                 "cryptiles": {
-                  "version": "0.2.2"
+                  "version": "0.2.2",
+                  "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
                 },
                 "sntp": {
-                  "version": "0.2.4"
+                  "version": "0.2.4",
+                  "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
                 }
               }
             },
             "aws-sign2": {
-              "version": "0.5.0"
+              "version": "0.5.0",
+              "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
             },
             "stringstream": {
-              "version": "0.0.4"
+              "version": "0.0.4",
+              "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
             }
           }
         },
         "request-progress": {
-          "version": "0.3.1",
+          "version": "0.3.0",
+          "from": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz",
           "dependencies": {
             "throttleit": {
-              "version": "0.0.2"
+              "version": "0.0.2",
+              "from": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
             }
           }
         },
         "retry": {
-          "version": "0.6.1"
+          "version": "0.6.0",
+          "from": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"
         },
         "rimraf": {
-          "version": "2.2.8"
+          "version": "2.2.8",
+          "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
         },
         "semver": {
-          "version": "2.3.2"
+          "version": "2.3.2",
+          "from": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz"
         },
         "shell-quote": {
-          "version": "1.4.2",
+          "version": "1.4.3",
+          "from": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz",
+          "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz",
           "dependencies": {
             "jsonify": {
-              "version": "0.0.0"
+              "version": "0.0.0",
+              "from": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
             },
             "array-filter": {
-              "version": "0.0.1"
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"
             },
             "array-reduce": {
-              "version": "0.0.0"
+              "version": "0.0.0",
+              "from": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"
             },
             "array-map": {
-              "version": "0.0.0"
+              "version": "0.0.0",
+              "from": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"
             }
           }
         },
         "stringify-object": {
-          "version": "1.0.0"
+          "version": "1.0.1",
+          "from": "https://registry.npmjs.org/stringify-object/-/stringify-object-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-1.0.1.tgz"
         },
         "tar-fs": {
           "version": "0.5.2",
+          "from": "https://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz",
           "dependencies": {
             "pump": {
               "version": "0.3.5",
+              "from": "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz",
+              "resolved": "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz",
               "dependencies": {
                 "once": {
-                  "version": "1.2.0"
+                  "version": "1.2.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.2.0.tgz"
                 },
                 "end-of-stream": {
                   "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
                   "dependencies": {
                     "once": {
                       "version": "1.3.1",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
@@ -962,127 +2942,205 @@
             },
             "tar-stream": {
               "version": "0.4.7",
+              "from": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz",
+              "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz",
               "dependencies": {
                 "bl": {
-                  "version": "0.9.3"
+                  "version": "0.9.4",
+                  "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz"
                 },
                 "end-of-stream": {
                   "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
                   "dependencies": {
                     "once": {
                       "version": "1.3.1",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "readable-stream": {
-                  "version": "1.0.32",
+                  "version": "1.0.33",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
-                  "version": "4.0.0"
+                  "version": "4.0.0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             }
           }
         },
         "tmp": {
-          "version": "0.0.23"
+          "version": "0.0.23",
+          "from": "https://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz"
         },
         "update-notifier": {
-          "version": "0.2.1",
+          "version": "0.2.0",
+          "from": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz",
           "dependencies": {
             "configstore": {
-              "version": "0.3.1",
+              "version": "0.3.2",
+              "from": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz",
+              "resolved": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz",
               "dependencies": {
                 "js-yaml": {
-                  "version": "3.0.2",
+                  "version": "3.2.7",
+                  "from": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz",
+                  "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz",
                   "dependencies": {
                     "argparse": {
-                      "version": "0.1.15",
+                      "version": "1.0.2",
+                      "from": "https://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz",
                       "dependencies": {
-                        "underscore": {
-                          "version": "1.4.4"
+                        "lodash": {
+                          "version": "3.6.0",
+                          "from": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz"
                         },
-                        "underscore.string": {
-                          "version": "2.3.3"
+                        "sprintf-js": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz"
                         }
                       }
                     },
                     "esprima": {
-                      "version": "1.0.4"
+                      "version": "2.0.0",
+                      "from": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz"
                     }
                   }
                 },
                 "object-assign": {
-                  "version": "0.3.1"
+                  "version": "2.0.0",
+                  "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
+                },
+                "user-home": {
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
                 },
                 "uuid": {
-                  "version": "1.4.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"
+                },
+                "xdg-basedir": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz"
                 }
               }
             },
             "latest-version": {
-              "version": "1.0.0",
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz",
               "dependencies": {
                 "package-json": {
-                  "version": "1.0.0",
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz",
                   "dependencies": {
                     "got": {
-                      "version": "1.2.1",
+                      "version": "0.3.0",
+                      "from": "https://registry.npmjs.org/got/-/got-0.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/got/-/got-0.3.0.tgz",
                       "dependencies": {
                         "object-assign": {
-                          "version": "0.3.1"
+                          "version": "0.3.1",
+                          "from": "https://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz",
+                          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz"
                         }
                       }
                     },
                     "registry-url": {
-                      "version": "1.0.0",
+                      "version": "0.1.1",
+                      "from": "https://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz",
                       "dependencies": {
                         "npmconf": {
-                          "version": "2.1.0",
+                          "version": "2.1.1",
+                          "from": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz",
                           "dependencies": {
                             "config-chain": {
                               "version": "1.1.8",
+                              "from": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
+                              "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
                               "dependencies": {
                                 "proto-list": {
-                                  "version": "1.2.3"
+                                  "version": "1.2.3",
+                                  "from": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz",
+                                  "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
                                 }
                               }
                             },
                             "inherits": {
-                              "version": "2.0.1"
+                              "version": "2.0.1",
+                              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                             },
                             "ini": {
-                              "version": "1.3.0"
+                              "version": "1.3.3",
+                              "from": "https://registry.npmjs.org/ini/-/ini-1.3.3.tgz",
+                              "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.3.tgz"
                             },
                             "once": {
                               "version": "1.3.1",
+                              "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                               "dependencies": {
                                 "wrappy": {
-                                  "version": "1.0.1"
+                                  "version": "1.0.1",
+                                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                                 }
                               }
                             },
                             "uid-number": {
-                              "version": "0.0.5"
+                              "version": "0.0.5",
+                              "from": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz",
+                              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
                             }
                           }
                         }
@@ -1093,21 +3151,24 @@
               }
             },
             "semver-diff": {
-              "version": "1.0.0",
-              "dependencies": {
-                "semver": {
-                  "version": "3.0.1"
-                }
-              }
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz"
             },
             "string-length": {
-              "version": "1.0.0",
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz",
               "dependencies": {
                 "strip-ansi": {
-                  "version": "2.0.0",
+                  "version": "0.2.2",
+                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz",
                   "dependencies": {
                     "ansi-regex": {
-                      "version": "1.1.0"
+                      "version": "0.1.0",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz"
                     }
                   }
                 }
@@ -1116,90 +3177,195 @@
           }
         },
         "which": {
-          "version": "1.0.5"
+          "version": "1.0.9",
+          "from": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz"
         }
       }
     },
     "browserstacktunnel-wrapper": {
       "version": "1.3.1",
+      "from": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-1.3.1.tgz",
       "dependencies": {
         "unzip": {
           "version": "0.1.11",
+          "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.11.tgz",
+          "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.11.tgz",
           "dependencies": {
             "fstream": {
               "version": "0.1.31",
+              "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
               "dependencies": {
                 "graceful-fs": {
-                  "version": "3.0.3"
+                  "version": "3.0.6",
+                  "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "mkdirp": {
                   "version": "0.5.0",
+                  "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
                   "dependencies": {
                     "minimist": {
-                      "version": "0.0.8"
+                      "version": "0.0.8",
+                      "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                     }
                   }
                 },
                 "rimraf": {
-                  "version": "2.2.8"
+                  "version": "2.3.2",
+                  "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "4.5.3",
+                      "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "2.0.4",
+                          "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.0",
+                              "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.2.0",
+                                  "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.1",
+                          "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
                 }
               }
             },
             "pullstream": {
               "version": "0.4.1",
+              "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
               "dependencies": {
                 "over": {
-                  "version": "0.0.5"
+                  "version": "0.0.5",
+                  "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
+                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
                 },
                 "slice-stream": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
                 }
               }
             },
             "binary": {
               "version": "0.3.0",
+              "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
               "dependencies": {
                 "chainsaw": {
                   "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
                   "dependencies": {
                     "traverse": {
-                      "version": "0.3.9"
+                      "version": "0.3.9",
+                      "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                     }
                   }
                 },
                 "buffers": {
-                  "version": "0.1.1"
+                  "version": "0.1.1",
+                  "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
                 }
               }
             },
             "readable-stream": {
-              "version": "1.0.32",
+              "version": "1.0.33",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31"
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "setimmediate": {
-              "version": "1.0.2"
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
             },
             "match-stream": {
               "version": "0.0.2",
+              "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
               "dependencies": {
                 "buffers": {
-                  "version": "0.1.1"
+                  "version": "0.1.1",
+                  "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
                 }
               }
             }
@@ -1208,69 +3374,107 @@
       }
     },
     "canonical-path": {
-      "version": "0.0.2"
+      "version": "0.0.2",
+      "from": "https://registry.npmjs.org/canonical-path/-/canonical-path-0.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-0.0.2.tgz"
     },
     "cheerio": {
       "version": "0.17.0",
+      "from": "https://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz",
       "dependencies": {
         "CSSselect": {
           "version": "0.4.1",
+          "from": "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz",
+          "resolved": "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz",
           "dependencies": {
             "CSSwhat": {
-              "version": "0.4.7"
+              "version": "0.4.7",
+              "from": "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz",
+              "resolved": "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"
             },
             "domutils": {
               "version": "1.4.3",
+              "from": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "dependencies": {
                 "domelementtype": {
-                  "version": "1.1.1"
+                  "version": "1.3.0",
+                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 }
               }
             }
           }
         },
         "entities": {
-          "version": "1.1.1"
+          "version": "1.1.1",
+          "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
           "version": "3.7.3",
+          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz",
           "dependencies": {
             "domhandler": {
-              "version": "2.2.0"
+              "version": "2.2.1",
+              "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"
             },
             "domutils": {
-              "version": "1.5.0"
+              "version": "1.5.1",
+              "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
             },
             "domelementtype": {
-              "version": "1.1.1"
+              "version": "1.3.0",
+              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31"
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "dom-serializer": {
           "version": "0.0.1",
+          "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz",
           "dependencies": {
             "domelementtype": {
-              "version": "1.1.1"
+              "version": "1.1.3",
+              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
             }
           }
         }
@@ -1278,266 +3482,511 @@
     },
     "dgeni": {
       "version": "0.4.1",
+      "from": "https://registry.npmjs.org/dgeni/-/dgeni-0.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/dgeni/-/dgeni-0.4.1.tgz",
       "dependencies": {
         "dependency-graph": {
           "version": "0.1.0",
+          "from": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.1.0.tgz",
           "dependencies": {
             "underscore": {
-              "version": "1.4.4"
+              "version": "1.4.4",
+              "from": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
+              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
             }
           }
         },
         "di": {
-          "version": "0.0.1"
+          "version": "0.0.1",
+          "from": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz"
         },
         "optimist": {
           "version": "0.6.1",
+          "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "dependencies": {
             "wordwrap": {
-              "version": "0.0.2"
+              "version": "0.0.2",
+              "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
             },
             "minimist": {
-              "version": "0.0.10"
+              "version": "0.0.10",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
             }
           }
         },
         "q": {
-          "version": "0.9.7"
+          "version": "0.9.7",
+          "from": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
+          "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz"
         },
         "validate.js": {
-          "version": "0.2.0"
+          "version": "0.2.0",
+          "from": "https://registry.npmjs.org/validate.js/-/validate.js-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/validate.js/-/validate.js-0.2.0.tgz"
         },
         "winston": {
           "version": "0.7.3",
+          "from": "https://registry.npmjs.org/winston/-/winston-0.7.3.tgz",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-0.7.3.tgz",
           "dependencies": {
             "async": {
-              "version": "0.2.10"
+              "version": "0.2.10",
+              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "colors": {
-              "version": "0.6.2"
+              "version": "0.6.2",
+              "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
             },
             "cycle": {
-              "version": "1.0.3"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
-              "version": "0.1.8"
+              "version": "0.1.8",
+              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
-              "version": "0.3.0"
+              "version": "0.3.0",
+              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
             },
             "request": {
               "version": "2.16.6",
+              "from": "https://registry.npmjs.org/request/-/request-2.16.6.tgz",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.16.6.tgz",
               "dependencies": {
                 "form-data": {
                   "version": "0.0.10",
+                  "from": "https://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz",
                   "dependencies": {
                     "combined-stream": {
-                      "version": "0.0.5",
+                      "version": "0.0.7",
+                      "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
                       "dependencies": {
                         "delayed-stream": {
-                          "version": "0.0.5"
+                          "version": "0.0.5",
+                          "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                         }
                       }
                     }
                   }
                 },
                 "mime": {
-                  "version": "1.2.11"
+                  "version": "1.2.11",
+                  "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                 },
                 "hawk": {
                   "version": "0.10.2",
+                  "from": "https://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz",
                   "dependencies": {
                     "hoek": {
-                      "version": "0.7.6"
+                      "version": "0.7.6",
+                      "from": "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"
                     },
                     "boom": {
-                      "version": "0.3.8"
+                      "version": "0.3.8",
+                      "from": "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz"
                     },
                     "cryptiles": {
-                      "version": "0.1.3"
+                      "version": "0.1.3",
+                      "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"
                     },
                     "sntp": {
-                      "version": "0.1.4"
+                      "version": "0.1.4",
+                      "from": "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"
                     }
                   }
                 },
                 "node-uuid": {
-                  "version": "1.4.1"
+                  "version": "1.4.3",
+                  "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                 },
                 "cookie-jar": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"
                 },
                 "aws-sign": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"
                 },
                 "oauth-sign": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"
                 },
                 "forever-agent": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"
                 },
                 "tunnel-agent": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"
                 },
                 "json-stringify-safe": {
-                  "version": "3.0.0"
+                  "version": "3.0.0",
+                  "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"
                 },
                 "qs": {
-                  "version": "0.5.6"
+                  "version": "0.5.6",
+                  "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
                 }
               }
             },
             "stack-trace": {
-              "version": "0.0.9"
+              "version": "0.0.9",
+              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
         }
       }
     },
     "dgeni-packages": {
-      "version": "0.10.8",
+      "version": "0.10.17",
+      "from": "dgeni-packages@0.10.17",
       "dependencies": {
         "catharsis": {
-          "version": "0.7.1"
+          "version": "0.8.7",
+          "from": "catharsis@>=0.8.1 <0.9.0",
+          "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.7.tgz",
+          "dependencies": {
+            "underscore-contrib": {
+              "version": "0.3.0",
+              "from": "underscore-contrib@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
+              "dependencies": {
+                "underscore": {
+                  "version": "1.6.0",
+                  "from": "underscore@1.6.0",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
+                }
+              }
+            }
+          }
         },
         "change-case": {
-          "version": "2.2.0",
+          "version": "2.3.0",
+          "from": "change-case@>=2.1.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/change-case/-/change-case-2.3.0.tgz",
           "dependencies": {
             "camel-case": {
-              "version": "1.1.1"
+              "version": "1.1.2",
+              "from": "camel-case@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-1.1.2.tgz"
             },
             "constant-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "constant-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-1.1.1.tgz"
             },
             "dot-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "dot-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-1.1.1.tgz"
             },
             "is-lower-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "is-lower-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.1.tgz"
             },
             "is-upper-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "is-upper-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.1.tgz"
             },
             "lower-case": {
-              "version": "1.1.1"
+              "version": "1.1.2",
+              "from": "lower-case@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.2.tgz"
+            },
+            "lower-case-first": {
+              "version": "1.0.0",
+              "from": "lower-case-first@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.0.tgz"
             },
             "param-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "param-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/param-case/-/param-case-1.1.1.tgz"
             },
             "pascal-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "pascal-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-1.1.1.tgz"
             },
             "path-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "path-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/path-case/-/path-case-1.1.1.tgz"
             },
             "sentence-case": {
-              "version": "1.1.1"
+              "version": "1.1.2",
+              "from": "sentence-case@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-1.1.2.tgz"
             },
             "snake-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "snake-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-1.1.1.tgz"
             },
             "swap-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "swap-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.1.tgz"
             },
             "title-case": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "title-case@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/title-case/-/title-case-1.1.1.tgz"
             },
             "upper-case": {
-              "version": "1.1.1"
+              "version": "1.1.2",
+              "from": "upper-case@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.2.tgz"
             },
             "upper-case-first": {
-              "version": "1.1.0"
+              "version": "1.1.1",
+              "from": "upper-case-first@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.1.tgz"
             }
           }
         },
         "esprima": {
-          "version": "1.2.3"
+          "version": "1.2.5",
+          "from": "esprima@>=1.0.4 <2.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
         },
         "estraverse": {
-          "version": "1.9.1"
+          "version": "1.9.3",
+          "from": "estraverse@>=1.5.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
         },
         "glob": {
           "version": "3.2.11",
+          "from": "glob@>=3.2.8 <3.3.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
           "dependencies": {
             "inherits": {
-              "version": "2.0.1"
+              "version": "2.0.1",
+              "from": "inherits@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "htmlparser2": {
-          "version": "3.8.2",
+          "version": "3.8.3",
+          "from": "htmlparser2@>=3.7.3 <4.0.0",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
           "dependencies": {
             "domhandler": {
-              "version": "2.3.0"
+              "version": "2.3.0",
+              "from": "domhandler@>=2.3.0 <2.4.0",
+              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
             },
             "domutils": {
-              "version": "1.5.0"
+              "version": "1.5.1",
+              "from": "domutils@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+              "dependencies": {
+                "dom-serializer": {
+                  "version": "0.1.0",
+                  "from": "dom-serializer@>=0.0.0 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+                  "dependencies": {
+                    "domelementtype": {
+                      "version": "1.1.3",
+                      "from": "domelementtype@>=1.1.1 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
+                    },
+                    "entities": {
+                      "version": "1.1.1",
+                      "from": "entities@>=1.1.1 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
+                    }
+                  }
+                }
+              }
             },
             "domelementtype": {
-              "version": "1.1.3"
+              "version": "1.3.0",
+              "from": "domelementtype@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
+              "from": "readable-stream@>=1.1.0 <1.2.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31"
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "entities@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "minimatch": {
           "version": "0.3.0",
+          "from": "minimatch@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
           "dependencies": {
             "lru-cache": {
-              "version": "2.5.0"
+              "version": "2.6.4",
+              "from": "lru-cache@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
             },
             "sigmund": {
-              "version": "1.0.0"
+              "version": "1.0.1",
+              "from": "sigmund@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
             }
           }
         },
         "nunjucks": {
-          "version": "1.0.7",
+          "version": "1.3.4",
+          "from": "nunjucks@>=1.2.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-1.3.4.tgz",
           "dependencies": {
             "optimist": {
               "version": "0.6.1",
+              "from": "optimist@*",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
-                  "version": "0.0.2"
+                  "version": "0.0.3",
+                  "from": "wordwrap@>=0.0.2 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                 },
                 "minimist": {
-                  "version": "0.0.10"
+                  "version": "0.0.10",
+                  "from": "minimist@>=0.0.1 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
                 }
               }
             },
             "chokidar": {
-              "version": "0.8.4",
-              "dependencies": {
+              "version": "0.12.6",
+              "from": "chokidar@>=0.12.5 <0.13.0",
+              "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz",
+              "dependencies": {
+                "readdirp": {
+                  "version": "1.3.0",
+                  "from": "readdirp@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "2.0.3",
+                      "from": "graceful-fs@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "from": "minimatch@>=0.2.12 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.6.4",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "from": "readable-stream@>=1.0.26-2 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "async-each": {
+                  "version": "0.1.6",
+                  "from": "async-each@>=0.1.5 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
+                },
                 "fsevents": {
-                  "version": "0.2.1",
-                  "from": "git://github.com/pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138",
-                  "resolved": "git://github.com/pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138",
+                  "version": "0.3.6",
+                  "from": "fsevents@>=0.3.1 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.6.tgz",
                   "dependencies": {
                     "nan": {
-                      "version": "0.8.0"
+                      "version": "1.8.4",
+                      "from": "nan@>=1.8.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
                     }
                   }
-                },
-                "recursive-readdir": {
-                  "version": "0.0.2"
                 }
               }
             }
@@ -1545,114 +3994,190 @@
         },
         "q-io": {
           "version": "1.10.9",
+          "from": "q-io@>=1.10.9 <1.11.0",
+          "resolved": "https://registry.npmjs.org/q-io/-/q-io-1.10.9.tgz",
           "dependencies": {
             "q": {
-              "version": "0.9.7"
+              "version": "0.9.7",
+              "from": "q@>=0.9.7 <0.10.0",
+              "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz"
             },
             "qs": {
-              "version": "0.1.0"
+              "version": "0.1.0",
+              "from": "qs@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-0.1.0.tgz"
             },
             "url2": {
-              "version": "0.0.0"
+              "version": "0.0.0",
+              "from": "url2@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/url2/-/url2-0.0.0.tgz"
             },
             "mime": {
-              "version": "1.2.11"
+              "version": "1.2.11",
+              "from": "mime@>=1.2.11 <1.3.0",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "mimeparse": {
-              "version": "0.1.4"
+              "version": "0.1.4",
+              "from": "mimeparse@>=0.1.4 <0.2.0",
+              "resolved": "https://registry.npmjs.org/mimeparse/-/mimeparse-0.1.4.tgz"
             },
             "collections": {
               "version": "0.2.2",
+              "from": "collections@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/collections/-/collections-0.2.2.tgz",
               "dependencies": {
                 "weak-map": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "weak-map@1.0.0",
+                  "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.0.tgz"
                 }
               }
             }
           }
         },
+        "semver": {
+          "version": "4.3.6",
+          "from": "semver@>=4.3.4 <5.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+        },
+        "shelljs": {
+          "version": "0.5.1",
+          "from": "shelljs@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.1.tgz"
+        },
         "winston": {
           "version": "0.7.3",
+          "from": "winston@>=0.7.2 <0.8.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-0.7.3.tgz",
           "dependencies": {
             "async": {
-              "version": "0.2.10"
+              "version": "0.2.10",
+              "from": "async@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "colors": {
-              "version": "0.6.2"
+              "version": "0.6.2",
+              "from": "colors@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
             },
             "cycle": {
-              "version": "1.0.3"
+              "version": "1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
-              "version": "0.1.8"
+              "version": "0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
-              "version": "0.3.0"
+              "version": "0.3.0",
+              "from": "pkginfo@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
             },
             "request": {
               "version": "2.16.6",
+              "from": "request@>=2.16.0 <2.17.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.16.6.tgz",
               "dependencies": {
                 "form-data": {
                   "version": "0.0.10",
+                  "from": "form-data@>=0.0.3 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz",
                   "dependencies": {
                     "combined-stream": {
                       "version": "0.0.7",
+                      "from": "combined-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
                       "dependencies": {
                         "delayed-stream": {
-                          "version": "0.0.5"
+                          "version": "0.0.5",
+                          "from": "delayed-stream@0.0.5",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                         }
                       }
                     }
                   }
                 },
                 "mime": {
-                  "version": "1.2.11"
+                  "version": "1.2.11",
+                  "from": "mime@>=1.2.7 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                 },
                 "hawk": {
                   "version": "0.10.2",
+                  "from": "hawk@>=0.10.2 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz",
                   "dependencies": {
                     "hoek": {
-                      "version": "0.7.6"
+                      "version": "0.7.6",
+                      "from": "hoek@>=0.7.0 <0.8.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"
                     },
                     "boom": {
-                      "version": "0.3.8"
+                      "version": "0.3.8",
+                      "from": "boom@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz"
                     },
                     "cryptiles": {
-                      "version": "0.1.3"
+                      "version": "0.1.3",
+                      "from": "cryptiles@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"
                     },
                     "sntp": {
-                      "version": "0.1.4"
+                      "version": "0.1.4",
+                      "from": "sntp@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"
                     }
                   }
                 },
                 "node-uuid": {
-                  "version": "1.4.2"
+                  "version": "1.4.3",
+                  "from": "node-uuid@>=1.4.0 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                 },
                 "cookie-jar": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "cookie-jar@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"
                 },
                 "aws-sign": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "aws-sign@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"
                 },
                 "oauth-sign": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "oauth-sign@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"
                 },
                 "forever-agent": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "forever-agent@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"
                 },
                 "tunnel-agent": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "tunnel-agent@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"
                 },
                 "json-stringify-safe": {
-                  "version": "3.0.0"
+                  "version": "3.0.0",
+                  "from": "json-stringify-safe@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"
                 },
                 "qs": {
-                  "version": "0.5.6"
+                  "version": "0.5.6",
+                  "from": "qs@>=0.5.4 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
                 }
               }
             },
             "stack-trace": {
-              "version": "0.0.9"
+              "version": "0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
         }
@@ -1660,263 +4185,411 @@
     },
     "event-stream": {
       "version": "3.1.7",
+      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz",
       "dependencies": {
         "through": {
-          "version": "2.3.6"
+          "version": "2.3.6",
+          "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         },
         "duplexer": {
-          "version": "0.1.1"
+          "version": "0.1.1",
+          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
-          "version": "0.1.3"
+          "version": "0.1.3",
+          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
-          "version": "0.1.0"
+          "version": "0.1.0",
+          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"
         },
         "pause-stream": {
-          "version": "0.0.11"
+          "version": "0.0.11",
+          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
-          "version": "0.2.10"
+          "version": "0.2.10",
+          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
-          "version": "0.0.4"
+          "version": "0.0.4",
+          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "grunt": {
       "version": "0.4.5",
+      "from": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
       "dependencies": {
         "async": {
-          "version": "0.1.22"
+          "version": "0.1.22",
+          "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
         },
         "coffee-script": {
-          "version": "1.3.3"
+          "version": "1.3.3",
+          "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz",
+          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
         },
         "colors": {
-          "version": "0.6.2"
+          "version": "0.6.2",
+          "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
         },
         "dateformat": {
-          "version": "1.0.2-1.2.3"
+          "version": "1.0.2-1.2.3",
+          "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz",
+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"
         },
         "eventemitter2": {
-          "version": "0.4.14"
+          "version": "0.4.14",
+          "from": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
+          "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
         },
         "findup-sync": {
           "version": "0.1.3",
+          "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
           "dependencies": {
             "glob": {
               "version": "3.2.11",
+              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.5.0"
+                      "version": "2.5.0",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
-                      "version": "1.0.0"
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
                 }
               }
             },
             "lodash": {
-              "version": "2.4.1"
+              "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
             }
           }
         },
         "glob": {
           "version": "3.1.21",
+          "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "1.2.3"
+              "version": "1.2.3",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
             },
             "inherits": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
             }
           }
         },
         "hooker": {
-          "version": "0.2.3"
+          "version": "0.2.3",
+          "from": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+          "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
         },
         "iconv-lite": {
-          "version": "0.2.11"
+          "version": "0.2.11",
+          "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
         },
         "minimatch": {
           "version": "0.2.14",
+          "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
           "dependencies": {
             "lru-cache": {
-              "version": "2.5.0"
+              "version": "2.5.0",
+              "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
             },
             "sigmund": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
             }
           }
         },
         "nopt": {
           "version": "1.0.10",
+          "from": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
           "dependencies": {
             "abbrev": {
-              "version": "1.0.5"
+              "version": "1.0.5",
+              "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz",
+              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
             }
           }
         },
         "rimraf": {
-          "version": "2.2.8"
+          "version": "2.2.8",
+          "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
         },
         "lodash": {
-          "version": "0.9.2"
+          "version": "0.9.2",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
         },
         "underscore.string": {
-          "version": "2.2.1"
+          "version": "2.2.1",
+          "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
         },
         "which": {
-          "version": "1.0.5"
+          "version": "1.0.9",
+          "from": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz"
         },
         "js-yaml": {
           "version": "2.0.5",
+          "from": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz",
           "dependencies": {
             "argparse": {
-              "version": "0.1.15",
+              "version": "0.1.16",
+              "from": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+              "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
               "dependencies": {
                 "underscore": {
-                  "version": "1.4.4"
+                  "version": "1.7.0",
+                  "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
                 },
                 "underscore.string": {
-                  "version": "2.3.3"
+                  "version": "2.4.0",
+                  "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
+                  "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
                 }
               }
             },
             "esprima": {
-              "version": "1.0.4"
+              "version": "1.0.4",
+              "from": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
             }
           }
         },
         "exit": {
-          "version": "0.1.2"
+          "version": "0.1.2",
+          "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
         },
         "getobject": {
-          "version": "0.1.0"
+          "version": "0.1.0",
+          "from": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
         },
         "grunt-legacy-util": {
-          "version": "0.2.0"
+          "version": "0.2.0",
+          "from": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"
         },
         "grunt-legacy-log": {
           "version": "0.1.1",
+          "from": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz",
           "dependencies": {
             "lodash": {
-              "version": "2.4.1"
+              "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
             },
             "underscore.string": {
-              "version": "2.3.3"
+              "version": "2.3.3",
+              "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
+              "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
             }
           }
         }
       }
     },
     "grunt-bump": {
-      "version": "0.0.15",
+      "version": "0.0.17",
+      "from": "https://registry.npmjs.org/grunt-bump/-/grunt-bump-0.0.17.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-bump/-/grunt-bump-0.0.17.tgz",
       "dependencies": {
         "semver": {
-          "version": "2.3.2"
+          "version": "2.3.2",
+          "from": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz"
         }
       }
     },
     "grunt-contrib-clean": {
       "version": "0.6.0",
+      "from": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-0.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-0.6.0.tgz",
       "dependencies": {
         "rimraf": {
-          "version": "2.2.8"
+          "version": "2.2.8",
+          "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
         }
       }
     },
     "grunt-contrib-compress": {
       "version": "0.12.0",
+      "from": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.12.0.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.11.0",
+          "from": "https://registry.npmjs.org/archiver/-/archiver-0.11.0.tgz",
+          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.11.0.tgz",
           "dependencies": {
             "async": {
-              "version": "0.9.0"
+              "version": "0.9.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
             },
             "buffer-crc32": {
-              "version": "0.2.3"
+              "version": "0.2.5",
+              "from": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz",
+              "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
             },
             "glob": {
               "version": "3.2.11",
+              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.5.0"
+                      "version": "2.5.0",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
-                      "version": "1.0.0"
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
                 }
               }
             },
             "lazystream": {
-              "version": "0.1.0"
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
             },
             "readable-stream": {
-              "version": "1.0.32",
+              "version": "1.0.33",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31"
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "tar-stream": {
               "version": "0.4.7",
+              "from": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz",
+              "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz",
               "dependencies": {
                 "bl": {
-                  "version": "0.9.3"
+                  "version": "0.9.4",
+                  "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz"
                 },
                 "end-of-stream": {
                   "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
                   "dependencies": {
                     "once": {
                       "version": "1.3.1",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "xtend": {
-                  "version": "4.0.0"
+                  "version": "4.0.0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "zip-stream": {
               "version": "0.4.1",
+              "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz",
               "dependencies": {
                 "compress-commons": {
                   "version": "0.1.6",
+                  "from": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz",
+                  "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz",
                   "dependencies": {
                     "crc32-stream": {
-                      "version": "0.3.1"
+                      "version": "0.3.3",
+                      "from": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.3.tgz",
+                      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.3.tgz"
                     }
                   }
                 }
@@ -1926,112 +4599,174 @@
         },
         "chalk": {
           "version": "0.5.1",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
-              "version": "1.1.0"
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
-              "version": "1.0.2"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
-              "version": "0.2.0"
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "prettysize": {
-          "version": "0.0.3"
+          "version": "0.0.3",
+          "from": "https://registry.npmjs.org/prettysize/-/prettysize-0.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/prettysize/-/prettysize-0.0.3.tgz"
         }
       }
     },
     "grunt-contrib-connect": {
       "version": "0.8.0",
+      "from": "https://registry.npmjs.org/grunt-contrib-connect/-/grunt-contrib-connect-0.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-connect/-/grunt-contrib-connect-0.8.0.tgz",
       "dependencies": {
         "connect": {
           "version": "2.19.6",
+          "from": "https://registry.npmjs.org/connect/-/connect-2.19.6.tgz",
+          "resolved": "https://registry.npmjs.org/connect/-/connect-2.19.6.tgz",
           "dependencies": {
             "basic-auth-connect": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"
             },
             "body-parser": {
               "version": "1.3.1",
+              "from": "https://registry.npmjs.org/body-parser/-/body-parser-1.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.3.1.tgz",
               "dependencies": {
                 "raw-body": {
-                  "version": "1.1.6"
+                  "version": "1.1.6",
+                  "from": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.6.tgz",
+                  "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.6.tgz"
                 }
               }
             },
             "bytes": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
             },
             "cookie": {
-              "version": "0.1.2"
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"
             },
             "cookie-parser": {
-              "version": "1.1.0"
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.1.0.tgz"
             },
             "cookie-signature": {
-              "version": "1.0.3"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz"
             },
             "compression": {
               "version": "1.0.7",
+              "from": "https://registry.npmjs.org/compression/-/compression-1.0.7.tgz",
+              "resolved": "https://registry.npmjs.org/compression/-/compression-1.0.7.tgz",
               "dependencies": {
                 "accepts": {
                   "version": "1.0.3",
+                  "from": "https://registry.npmjs.org/accepts/-/accepts-1.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.0.3.tgz",
                   "dependencies": {
                     "mime": {
-                      "version": "1.2.11"
+                      "version": "1.2.11",
+                      "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+                      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                     },
                     "negotiator": {
-                      "version": "0.4.6"
+                      "version": "0.4.6",
+                      "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.6.tgz",
+                      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.6.tgz"
                     }
                   }
                 },
                 "compressible": {
-                  "version": "1.1.0"
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/compressible/-/compressible-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/compressible/-/compressible-1.1.0.tgz"
                 },
                 "vary": {
-                  "version": "0.1.0"
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz"
                 }
               }
             },
             "connect-timeout": {
               "version": "1.1.0",
+              "from": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.1.0.tgz",
               "dependencies": {
                 "debug": {
-                  "version": "0.8.1"
+                  "version": "0.8.1",
+                  "from": "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz"
                 }
               }
             },
             "csurf": {
               "version": "1.2.1",
+              "from": "https://registry.npmjs.org/csurf/-/csurf-1.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.2.1.tgz",
               "dependencies": {
                 "csrf-tokens": {
                   "version": "1.0.4",
+                  "from": "https://registry.npmjs.org/csrf-tokens/-/csrf-tokens-1.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/csrf-tokens/-/csrf-tokens-1.0.4.tgz",
                   "dependencies": {
                     "rndm": {
-                      "version": "1.0.0"
+                      "version": "1.1.0",
+                      "from": "https://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz"
                     },
                     "uid2": {
-                      "version": "0.0.3"
+                      "version": "0.0.3",
+                      "from": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz",
+                      "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"
                     },
                     "scmp": {
-                      "version": "0.0.3"
+                      "version": "0.0.3",
+                      "from": "https://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz",
+                      "resolved": "https://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz"
                     }
                   }
                 }
@@ -2039,130 +4774,204 @@
             },
             "debug": {
               "version": "1.0.2",
+              "from": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
               "dependencies": {
                 "ms": {
-                  "version": "0.6.2"
+                  "version": "0.6.2",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
                 }
               }
             },
             "errorhandler": {
-              "version": "1.0.2"
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.0.2.tgz"
             },
             "escape-html": {
-              "version": "1.0.1"
+              "version": "1.0.1",
+              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             },
             "express-session": {
               "version": "1.2.1",
+              "from": "https://registry.npmjs.org/express-session/-/express-session-1.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.2.1.tgz",
               "dependencies": {
                 "utils-merge": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
                 },
                 "uid2": {
-                  "version": "0.0.3"
+                  "version": "0.0.3",
+                  "from": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"
                 },
                 "buffer-crc32": {
-                  "version": "0.2.1"
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"
                 },
                 "debug": {
-                  "version": "0.8.1"
+                  "version": "0.8.1",
+                  "from": "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz"
                 }
               }
             },
             "fresh": {
-              "version": "0.2.2"
+              "version": "0.2.2",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz",
+              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"
             },
             "method-override": {
               "version": "2.0.2",
+              "from": "https://registry.npmjs.org/method-override/-/method-override-2.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.0.2.tgz",
               "dependencies": {
                 "methods": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"
                 },
                 "vary": {
-                  "version": "0.1.0"
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz"
                 }
               }
             },
             "morgan": {
-              "version": "1.1.1"
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/morgan/-/morgan-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.1.1.tgz"
             },
             "multiparty": {
               "version": "3.2.8",
+              "from": "https://registry.npmjs.org/multiparty/-/multiparty-3.2.8.tgz",
+              "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.2.8.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.1.13",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "stream-counter": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"
                 }
               }
             },
             "on-headers": {
-              "version": "0.0.0"
+              "version": "0.0.0",
+              "from": "https://registry.npmjs.org/on-headers/-/on-headers-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-0.0.0.tgz"
             },
             "parseurl": {
-              "version": "1.0.1"
+              "version": "1.0.1",
+              "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz"
             },
             "qs": {
-              "version": "0.6.6"
+              "version": "0.6.6",
+              "from": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
             },
             "response-time": {
-              "version": "2.0.0"
+              "version": "2.0.0",
+              "from": "https://registry.npmjs.org/response-time/-/response-time-2.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.0.0.tgz"
             },
             "serve-favicon": {
-              "version": "2.0.1"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz"
             },
             "serve-index": {
               "version": "1.1.1",
+              "from": "https://registry.npmjs.org/serve-index/-/serve-index-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.1.1.tgz",
               "dependencies": {
                 "accepts": {
                   "version": "1.0.3",
+                  "from": "https://registry.npmjs.org/accepts/-/accepts-1.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.0.3.tgz",
                   "dependencies": {
                     "mime": {
-                      "version": "1.2.11"
+                      "version": "1.2.11",
+                      "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+                      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                     },
                     "negotiator": {
-                      "version": "0.4.6"
+                      "version": "0.4.6",
+                      "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.6.tgz",
+                      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.6.tgz"
                     }
                   }
                 },
                 "batch": {
-                  "version": "0.5.0"
+                  "version": "0.5.0",
+                  "from": "https://registry.npmjs.org/batch/-/batch-0.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.0.tgz"
                 }
               }
             },
             "serve-static": {
               "version": "1.2.3",
+              "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.2.3.tgz",
+              "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.2.3.tgz",
               "dependencies": {
                 "send": {
                   "version": "0.4.3",
+                  "from": "https://registry.npmjs.org/send/-/send-0.4.3.tgz",
+                  "resolved": "https://registry.npmjs.org/send/-/send-0.4.3.tgz",
                   "dependencies": {
                     "finished": {
                       "version": "1.2.2",
+                      "from": "https://registry.npmjs.org/finished/-/finished-1.2.2.tgz",
+                      "resolved": "https://registry.npmjs.org/finished/-/finished-1.2.2.tgz",
                       "dependencies": {
                         "ee-first": {
-                          "version": "1.0.3"
+                          "version": "1.0.3",
+                          "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz"
                         }
                       }
                     },
                     "mime": {
-                      "version": "1.2.11"
+                      "version": "1.2.11",
+                      "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+                      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                     },
                     "range-parser": {
-                      "version": "1.0.2"
+                      "version": "1.0.2",
+                      "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
                     }
                   }
                 }
@@ -2170,69 +4979,105 @@
             },
             "type-is": {
               "version": "1.2.1",
+              "from": "https://registry.npmjs.org/type-is/-/type-is-1.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.2.1.tgz",
               "dependencies": {
                 "mime-types": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.0.tgz"
                 }
               }
             },
             "vhost": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz"
             },
             "pause": {
-              "version": "0.0.1"
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"
             }
           }
         },
         "connect-livereload": {
-          "version": "0.4.0"
+          "version": "0.4.1",
+          "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.4.1.tgz",
+          "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.4.1.tgz"
         },
         "open": {
-          "version": "0.0.5"
+          "version": "0.0.5",
+          "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
         },
         "portscanner": {
           "version": "0.2.3",
+          "from": "https://registry.npmjs.org/portscanner/-/portscanner-0.2.3.tgz",
+          "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-0.2.3.tgz",
           "dependencies": {
             "async": {
-              "version": "0.1.15"
+              "version": "0.1.15",
+              "from": "https://registry.npmjs.org/async/-/async-0.1.15.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.1.15.tgz"
             }
           }
         },
         "async": {
-          "version": "0.9.0"
+          "version": "0.9.0",
+          "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
     },
     "grunt-contrib-copy": {
       "version": "0.6.0",
+      "from": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-0.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-0.6.0.tgz",
       "dependencies": {
         "chalk": {
           "version": "0.5.1",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
-              "version": "1.1.0"
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
-              "version": "1.0.2"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
-              "version": "0.2.0"
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         }
@@ -2240,30 +5085,43 @@
     },
     "grunt-contrib-jshint": {
       "version": "0.10.0",
+      "from": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.10.0.tgz",
       "dependencies": {
         "jshint": {
-          "version": "2.5.6",
+          "version": "2.5.11",
+          "from": "https://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz",
+          "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz",
           "dependencies": {
-            "underscore": {
-              "version": "1.6.0"
-            },
             "cli": {
-              "version": "0.6.4",
+              "version": "0.6.6",
+              "from": "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz",
+              "resolved": "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
+                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0"
+                          "version": "2.5.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
-                          "version": "1.0.0"
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
                     }
@@ -2271,184 +5129,320 @@
                 }
               }
             },
-            "minimatch": {
-              "version": "1.0.0",
+            "console-browserify": {
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
               "dependencies": {
-                "lru-cache": {
-                  "version": "2.5.0"
-                },
-                "sigmund": {
-                  "version": "1.0.0"
+                "date-now": {
+                  "version": "0.1.4",
+                  "from": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+                  "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
                 }
               }
             },
+            "exit": {
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+            },
             "htmlparser2": {
-              "version": "3.7.3",
+              "version": "3.8.2",
+              "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
+              "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
               "dependencies": {
                 "domhandler": {
-                  "version": "2.2.0"
+                  "version": "2.3.0",
+                  "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
                 },
                 "domutils": {
-                  "version": "1.5.0"
+                  "version": "1.5.1",
+                  "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+                  "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+                  "dependencies": {
+                    "dom-serializer": {
+                      "version": "0.1.0",
+                      "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+                      "dependencies": {
+                        "domelementtype": {
+                          "version": "1.1.3",
+                          "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+                          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
+                        },
+                        "entities": {
+                          "version": "1.1.1",
+                          "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
+                        }
+                      }
+                    }
+                  }
                 },
                 "domelementtype": {
-                  "version": "1.1.1"
+                  "version": "1.3.0",
+                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 },
                 "readable-stream": {
                   "version": "1.1.13",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "entities": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
                 }
               }
             },
-            "console-browserify": {
-              "version": "1.1.0",
+            "minimatch": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
               "dependencies": {
-                "date-now": {
-                  "version": "0.1.4"
+                "lru-cache": {
+                  "version": "2.5.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                },
+                "sigmund": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
-            "exit": {
-              "version": "0.1.2"
-            },
             "strip-json-comments": {
-              "version": "1.0.1"
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"
+            },
+            "underscore": {
+              "version": "1.6.0",
+              "from": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
             }
           }
         },
         "hooker": {
-          "version": "0.2.3"
+          "version": "0.2.3",
+          "from": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+          "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
         }
       }
     },
     "grunt-ddescribe-iit": {
-      "version": "0.0.4"
+      "version": "0.0.6",
+      "from": "https://registry.npmjs.org/grunt-ddescribe-iit/-/grunt-ddescribe-iit-0.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-ddescribe-iit/-/grunt-ddescribe-iit-0.0.6.tgz",
+      "dependencies": {
+        "bluebird": {
+          "version": "2.9.24",
+          "from": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.24.tgz",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.24.tgz"
+        },
+        "win-spawn": {
+          "version": "2.0.0",
+          "from": "https://registry.npmjs.org/win-spawn/-/win-spawn-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/win-spawn/-/win-spawn-2.0.0.tgz"
+        }
+      }
     },
     "grunt-jasmine-node": {
       "version": "0.1.0",
-      "from": "grunt-jasmine-node@git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
+      "from": "git://github.com/vojtajina/grunt-jasmine-node.git#ced17cbe52c1412b2ada53160432a5b681f37cd7",
       "resolved": "git://github.com/vojtajina/grunt-jasmine-node.git#ced17cbe52c1412b2ada53160432a5b681f37cd7"
     },
     "grunt-jscs": {
       "version": "1.2.0",
+      "from": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.2.0.tgz",
       "dependencies": {
         "hooker": {
-          "version": "0.2.3"
+          "version": "0.2.3",
+          "from": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+          "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
         },
         "jscs": {
           "version": "1.10.0",
+          "from": "https://registry.npmjs.org/jscs/-/jscs-1.10.0.tgz",
+          "resolved": "https://registry.npmjs.org/jscs/-/jscs-1.10.0.tgz",
           "dependencies": {
             "colors": {
-              "version": "1.0.3"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
             },
             "commander": {
-              "version": "2.5.1"
+              "version": "2.5.1",
+              "from": "https://registry.npmjs.org/commander/-/commander-2.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.5.1.tgz"
             },
             "esprima": {
-              "version": "1.2.3"
+              "version": "1.2.5",
+              "from": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz",
+              "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
             },
             "esprima-harmony-jscs": {
-              "version": "1.1.0-regex-token-fix"
+              "version": "1.1.0-regex-token-fix",
+              "from": "https://registry.npmjs.org/esprima-harmony-jscs/-/esprima-harmony-jscs-1.1.0-regex-token-fix.tgz",
+              "resolved": "https://registry.npmjs.org/esprima-harmony-jscs/-/esprima-harmony-jscs-1.1.0-regex-token-fix.tgz"
             },
             "estraverse": {
-              "version": "1.9.1"
+              "version": "1.9.3",
+              "from": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
             },
             "exit": {
-              "version": "0.1.2"
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
             },
             "glob": {
               "version": "4.0.6",
+              "from": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
               "dependencies": {
                 "graceful-fs": {
-                  "version": "3.0.5"
+                  "version": "3.0.6",
+                  "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.5.0"
+                      "version": "2.5.0",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
-                      "version": "1.0.0"
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
                 },
                 "once": {
                   "version": "1.3.1",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 }
               }
             },
             "minimatch": {
-              "version": "2.0.1",
+              "version": "2.0.4",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "dependencies": {
                     "balanced-match": {
-                      "version": "0.2.0"
+                      "version": "0.2.0",
+                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                     },
                     "concat-map": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
                 }
               }
             },
             "strip-json-comments": {
-              "version": "1.0.2"
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"
             },
             "vow-fs": {
               "version": "0.3.4",
+              "from": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz",
+              "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz",
               "dependencies": {
                 "node-uuid": {
-                  "version": "1.4.2"
+                  "version": "1.4.3",
+                  "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                 },
                 "vow-queue": {
-                  "version": "0.4.1"
+                  "version": "0.4.1",
+                  "from": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.1.tgz"
                 },
                 "glob": {
-                  "version": "4.3.5",
+                  "version": "4.5.3",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
                       "version": "1.3.1",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
@@ -2458,122 +5452,229 @@
             },
             "xmlbuilder": {
               "version": "2.4.6",
+              "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.6.tgz",
+              "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.6.tgz",
               "dependencies": {
                 "lodash-node": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
                 }
               }
             },
             "supports-color": {
-              "version": "1.2.0"
+              "version": "1.2.1",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz"
             }
           }
         },
         "vow": {
-          "version": "0.4.8"
+          "version": "0.4.9",
+          "from": "https://registry.npmjs.org/vow/-/vow-0.4.9.tgz",
+          "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.9.tgz"
         }
       }
     },
     "grunt-merge-conflict": {
-      "version": "0.0.2"
+      "version": "0.0.2",
+      "from": "https://registry.npmjs.org/grunt-merge-conflict/-/grunt-merge-conflict-0.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-merge-conflict/-/grunt-merge-conflict-0.0.2.tgz"
     },
     "grunt-shell": {
-      "version": "1.1.1",
+      "version": "1.1.2",
+      "from": "https://registry.npmjs.org/grunt-shell/-/grunt-shell-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-shell/-/grunt-shell-1.1.2.tgz",
       "dependencies": {
         "chalk": {
-          "version": "0.5.1",
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
           "dependencies": {
             "ansi-styles": {
-              "version": "1.1.0"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
             },
             "escape-string-regexp": {
-              "version": "1.0.2"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
-              "version": "0.1.0",
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                },
+                "get-stdin": {
+                  "version": "4.0.1",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 }
               }
             },
             "strip-ansi": {
-              "version": "0.3.0",
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                 }
               }
             },
             "supports-color": {
-              "version": "0.2.0"
+              "version": "1.3.1",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
             }
           }
         }
       }
     },
     "gulp": {
-      "version": "3.8.8",
+      "version": "3.8.11",
+      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz",
       "dependencies": {
         "archy": {
-          "version": "0.0.2"
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
         },
         "chalk": {
           "version": "0.5.1",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
-              "version": "1.1.0"
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
-              "version": "1.0.2"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "0.2.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
-              "version": "0.2.0"
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
-          "version": "0.0.1"
+          "version": "0.0.1",
+          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "interpret": {
-          "version": "0.3.7"
+          "version": "0.3.10",
+          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
-          "version": "0.12.1",
+          "version": "2.0.3",
+          "from": "https://registry.npmjs.org/liftoff/-/liftoff-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.0.3.tgz",
           "dependencies": {
+            "extend": {
+              "version": "2.0.0",
+              "from": "https://registry.npmjs.org/extend/-/extend-2.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-2.0.0.tgz"
+            },
             "findup-sync": {
-              "version": "0.1.3",
+              "version": "0.2.1",
+              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "3.2.11",
+                  "version": "4.3.5",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
                   "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "0.3.0",
+                      "version": "2.0.4",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                       "dependencies": {
-                        "lru-cache": {
-                          "version": "2.5.0"
-                        },
-                        "sigmund": {
-                          "version": "1.0.0"
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
@@ -2581,346 +5682,252 @@
                 }
               }
             },
-            "resolve": {
-              "version": "0.7.4"
-            },
-            "minimist": {
-              "version": "0.2.0"
+            "flagged-respawn": {
+              "version": "0.3.1",
+              "from": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"
             },
-            "extend": {
-              "version": "1.3.0"
+            "resolve": {
+              "version": "1.1.6",
+              "from": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz",
+              "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
             }
           }
         },
         "minimist": {
-          "version": "1.1.0"
+          "version": "1.1.1",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
+          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
+              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 }
               }
             },
             "sequencify": {
-              "version": "0.0.7"
+              "version": "0.0.7",
+              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
-              "version": "0.1.0"
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
-          "version": "0.2.1"
+          "version": "0.2.2",
+          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
-          "version": "3.0.1"
+          "version": "4.3.3",
+          "from": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz"
         },
         "tildify": {
           "version": "1.0.0",
+          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
-              "version": "1.0.0"
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
         },
-        "vinyl-fs": {
-          "version": "0.3.7",
-          "dependencies": {
-            "glob-stream": {
-              "version": "3.1.15",
-              "dependencies": {
-                "glob": {
-                  "version": "4.0.6",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1"
-                    },
-                    "once": {
-                      "version": "1.3.1",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1"
-                        }
-                      }
-                    }
-                  }
-                },
-                "minimatch": {
-                  "version": "1.0.0",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.5.0"
-                    },
-                    "sigmund": {
-                      "version": "1.0.0"
-                    }
-                  }
-                },
-                "ordered-read-streams": {
-                  "version": "0.0.8"
-                },
-                "glob2base": {
-                  "version": "0.0.11"
-                },
-                "unique-stream": {
-                  "version": "1.0.0"
-                }
-              }
-            },
-            "glob-watcher": {
-              "version": "0.0.6",
-              "dependencies": {
-                "gaze": {
-                  "version": "0.5.1",
-                  "dependencies": {
-                    "globule": {
-                      "version": "0.1.0",
-                      "dependencies": {
-                        "lodash": {
-                          "version": "1.0.1"
-                        },
-                        "glob": {
-                          "version": "3.1.21",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "1.2.3"
-                            },
-                            "inherits": {
-                              "version": "1.0.0"
-                            }
-                          }
-                        },
-                        "minimatch": {
-                          "version": "0.2.14",
-                          "dependencies": {
-                            "lru-cache": {
-                              "version": "2.5.0"
-                            },
-                            "sigmund": {
-                              "version": "1.0.0"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "graceful-fs": {
-              "version": "3.0.2"
-            },
-            "mkdirp": {
-              "version": "0.5.0",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8"
-                }
-              }
-            },
-            "strip-bom": {
-              "version": "1.0.0",
-              "dependencies": {
-                "first-chunk-stream": {
-                  "version": "1.0.0"
-                },
-                "is-utf8": {
-                  "version": "0.2.0"
-                }
-              }
-            },
-            "through2": {
-              "version": "0.6.2",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.32",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1"
-                    },
-                    "isarray": {
-                      "version": "0.0.1"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31"
-                    },
-                    "inherits": {
-                      "version": "2.0.1"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.0"
-                }
-              }
-            },
-            "vinyl": {
-              "version": "0.4.3",
-              "dependencies": {
-                "clone-stats": {
-                  "version": "0.0.1"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "gulp-concat": {
-      "version": "2.4.1",
-      "dependencies": {
-        "concat-with-sourcemaps": {
-          "version": "0.1.5",
+        "v8flags": {
+          "version": "2.0.3",
+          "from": "https://registry.npmjs.org/v8flags/-/v8flags-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.0.3.tgz",
           "dependencies": {
-            "source-map": {
-              "version": "0.1.39",
-              "dependencies": {
-                "amdefine": {
-                  "version": "0.1.0"
-                }
-              }
+            "user-home": {
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
         },
-        "gulp-util": {
-          "version": "2.2.20",
+        "vinyl-fs": {
+          "version": "0.3.13",
+          "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.13.tgz",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.13.tgz",
           "dependencies": {
-            "chalk": {
-              "version": "0.5.1",
+            "defaults": {
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
               "dependencies": {
-                "ansi-styles": {
-                  "version": "1.1.0"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.2"
-                },
-                "has-ansi": {
-                  "version": "0.1.0",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "0.2.1"
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "0.3.0",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "0.2.1"
-                    }
-                  }
-                },
-                "supports-color": {
-                  "version": "0.2.0"
+                "clone": {
+                  "version": "0.1.19",
+                  "from": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
                 }
               }
             },
-            "dateformat": {
-              "version": "1.0.8"
-            },
-            "lodash._reinterpolate": {
-              "version": "2.4.1"
-            },
-            "lodash.template": {
-              "version": "2.4.1",
+            "glob-stream": {
+              "version": "3.1.18",
+              "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
               "dependencies": {
-                "lodash.defaults": {
-                  "version": "2.4.1",
-                  "dependencies": {
-                    "lodash._objecttypes": {
-                      "version": "2.4.1"
-                    }
-                  }
-                },
-                "lodash.escape": {
-                  "version": "2.4.1",
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
-                    "lodash._escapehtmlchar": {
-                      "version": "2.4.1",
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
-                        "lodash._htmlescapes": {
-                          "version": "2.4.1"
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
-                    "lodash._reunescapedhtml": {
-                      "version": "2.4.1",
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
-                        "lodash._htmlescapes": {
-                          "version": "2.4.1"
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
                   }
                 },
-                "lodash._escapestringchar": {
-                  "version": "2.4.1"
-                },
-                "lodash.keys": {
-                  "version": "2.4.1",
+                "minimatch": {
+                  "version": "2.0.4",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                   "dependencies": {
-                    "lodash._isnative": {
-                      "version": "2.4.1"
-                    },
-                    "lodash.isobject": {
-                      "version": "2.4.1",
-                      "dependencies": {
-                        "lodash._objecttypes": {
-                          "version": "2.4.1"
-                        }
-                      }
-                    },
-                    "lodash._shimkeys": {
-                      "version": "2.4.1",
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                       "dependencies": {
-                        "lodash._objecttypes": {
-                          "version": "2.4.1"
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                         }
                       }
                     }
                   }
                 },
-                "lodash.templatesettings": {
-                  "version": "2.4.1"
+                "ordered-read-streams": {
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
                 },
-                "lodash.values": {
-                  "version": "2.4.1"
+                "glob2base": {
+                  "version": "0.0.12",
+                  "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+                  "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+                  "dependencies": {
+                    "find-index": {
+                      "version": "0.1.1",
+                      "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                    }
+                  }
+                },
+                "unique-stream": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
                 }
               }
             },
-            "minimist": {
-              "version": "0.2.0"
-            },
-            "multipipe": {
-              "version": "0.1.1",
+            "glob-watcher": {
+              "version": "0.0.6",
+              "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
               "dependencies": {
-                "duplexer2": {
-                  "version": "0.0.2",
+                "gaze": {
+                  "version": "0.5.1",
+                  "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+                  "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
                   "dependencies": {
-                    "readable-stream": {
-                      "version": "1.1.13",
+                    "globule": {
+                      "version": "0.1.0",
+                      "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                       "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.1"
-                        },
-                        "isarray": {
-                          "version": "0.0.1"
+                        "lodash": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                         },
-                        "string_decoder": {
-                          "version": "0.10.31"
+                        "glob": {
+                          "version": "3.1.21",
+                          "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "1.2.3",
+                              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                            },
+                            "inherits": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
+                            }
+                          }
                         },
-                        "inherits": {
-                          "version": "2.0.1"
+                        "minimatch": {
+                          "version": "0.2.14",
+                          "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.5.0",
+                              "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                            }
+                          }
                         }
                       }
                     }
@@ -2928,178 +5935,431 @@
                 }
               }
             },
+            "graceful-fs": {
+              "version": "3.0.6",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "strip-bom": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+              "dependencies": {
+                "first-chunk-stream": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+                },
+                "is-utf8": {
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                }
+              }
+            },
             "through2": {
-              "version": "0.5.1",
+              "version": "0.6.3",
+              "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
-                  "version": "1.0.32",
+                  "version": "1.0.33",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
-                  "version": "3.0.0"
+                  "version": "4.0.0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
-              "version": "0.2.3",
+              "version": "0.4.6",
+              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
+                "clone": {
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                },
                 "clone-stats": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "gulp-concat": {
+      "version": "2.5.2",
+      "from": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.5.2.tgz",
+      "dependencies": {
+        "concat-with-sourcemaps": {
+          "version": "1.0.2",
+          "from": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.2.tgz",
+          "dependencies": {
+            "source-map": {
+              "version": "0.4.2",
+              "from": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
+              "dependencies": {
+                "amdefine": {
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
                 }
               }
             }
           }
         },
-        "through": {
-          "version": "2.3.6"
+        "through2": {
+          "version": "0.6.3",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+            }
+          }
         }
       }
     },
     "gulp-foreach": {
       "version": "0.0.1",
+      "from": "https://registry.npmjs.org/gulp-foreach/-/gulp-foreach-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/gulp-foreach/-/gulp-foreach-0.0.1.tgz",
       "dependencies": {
         "gulp-util": {
           "version": "2.2.20",
+          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
           "dependencies": {
             "chalk": {
               "version": "0.5.1",
+              "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
               "dependencies": {
                 "ansi-styles": {
-                  "version": "1.1.0"
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
                 },
                 "escape-string-regexp": {
-                  "version": "1.0.2"
+                  "version": "1.0.3",
+                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
-                      "version": "0.2.1"
+                      "version": "0.2.1",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
-                      "version": "0.2.1"
+                      "version": "0.2.1",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                     }
                   }
                 },
                 "supports-color": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
                 }
               }
             },
             "dateformat": {
-              "version": "1.0.8"
+              "version": "1.0.11",
+              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "dependencies": {
+                "get-stdin": {
+                  "version": "4.0.1",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                },
+                "meow": {
+                  "version": "3.1.0",
+                  "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "dependencies": {
+                    "camelcase-keys": {
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                        },
+                        "map-obj": {
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "indent-string": {
+                      "version": "1.2.1",
+                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "dependencies": {
+                        "repeating": {
+                          "version": "1.1.2",
+                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                          "dependencies": {
+                            "is-finite": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "minimist": {
+                      "version": "1.1.1",
+                      "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+                    },
+                    "object-assign": {
+                      "version": "2.0.0",
+                      "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
+                    }
+                  }
+                }
+              }
             },
             "lodash._reinterpolate": {
-              "version": "2.4.1"
+              "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
             },
             "lodash.template": {
               "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
               "dependencies": {
                 "lodash.defaults": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
                   "dependencies": {
                     "lodash._objecttypes": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.escape": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
                   "dependencies": {
                     "lodash._escapehtmlchar": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._reunescapedhtml": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "lodash._escapestringchar": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"
                 },
                 "lodash.keys": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "lodash.templatesettings": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
                 },
                 "lodash.values": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"
                 }
               }
             },
             "minimist": {
-              "version": "0.2.0"
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "multipipe": {
-              "version": "0.1.1",
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
+                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
-                          "version": "0.0.1"
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
-                          "version": "0.10.31"
+                          "version": "0.10.31",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
-                          "version": "2.0.1"
+                          "version": "2.0.1",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
                     }
@@ -3109,87 +6369,149 @@
             },
             "through2": {
               "version": "0.5.1",
+              "from": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
               "dependencies": {
                 "readable-stream": {
-                  "version": "1.0.32",
+                  "version": "1.0.33",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
-                  "version": "3.0.0"
+                  "version": "3.0.0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.2.3",
+              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
               "dependencies": {
                 "clone-stats": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
             }
           }
         },
         "through": {
-          "version": "2.3.6"
+          "version": "2.3.6",
+          "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         }
       }
     },
     "gulp-jshint": {
       "version": "1.4.2",
+      "from": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-1.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-1.4.2.tgz",
       "dependencies": {
         "map-stream": {
-          "version": "0.1.0"
+          "version": "0.1.0",
+          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"
         },
         "jshint": {
           "version": "2.4.4",
+          "from": "https://registry.npmjs.org/jshint/-/jshint-2.4.4.tgz",
+          "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.4.4.tgz",
           "dependencies": {
             "shelljs": {
-              "version": "0.1.4"
+              "version": "0.1.4",
+              "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz",
+              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"
             },
             "underscore": {
-              "version": "1.4.4"
+              "version": "1.4.4",
+              "from": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
+              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
             },
             "cli": {
               "version": "0.4.5",
+              "from": "https://registry.npmjs.org/cli/-/cli-0.4.5.tgz",
+              "resolved": "https://registry.npmjs.org/cli/-/cli-0.4.5.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.0.6",
+                  "version": "5.0.3",
+                  "from": "https://registry.npmjs.org/glob/-/glob-5.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.3.tgz",
                   "dependencies": {
-                    "graceful-fs": {
-                      "version": "3.0.2"
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "1.0.0",
+                      "version": "2.0.4",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                       "dependencies": {
-                        "lru-cache": {
-                          "version": "2.5.0"
-                        },
-                        "sigmund": {
-                          "version": "1.0.0"
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
                         }
                       }
                     },
                     "once": {
                       "version": "1.3.1",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
@@ -3199,183 +6521,343 @@
             },
             "minimatch": {
               "version": "0.4.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.5.0"
+                  "version": "2.5.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "htmlparser2": {
               "version": "3.3.0",
+              "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
               "dependencies": {
                 "domhandler": {
-                  "version": "2.1.0"
+                  "version": "2.1.0",
+                  "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz"
                 },
                 "domutils": {
-                  "version": "1.1.6"
+                  "version": "1.1.6",
+                  "from": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz",
+                  "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz"
                 },
                 "domelementtype": {
-                  "version": "1.1.1"
+                  "version": "1.3.0",
+                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 },
                 "readable-stream": {
-                  "version": "1.0.32",
+                  "version": "1.0.33",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 }
               }
             },
             "console-browserify": {
-              "version": "0.1.6"
+              "version": "0.1.6",
+              "from": "https://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz",
+              "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz"
             },
             "exit": {
-              "version": "0.1.2"
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
             }
           }
         },
         "gulp-util": {
           "version": "2.2.20",
+          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
           "dependencies": {
             "chalk": {
               "version": "0.5.1",
+              "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
               "dependencies": {
                 "ansi-styles": {
-                  "version": "1.1.0"
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
                 },
                 "escape-string-regexp": {
-                  "version": "1.0.2"
+                  "version": "1.0.3",
+                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
-                      "version": "0.2.1"
+                      "version": "0.2.1",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
-                      "version": "0.2.1"
+                      "version": "0.2.1",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                     }
                   }
                 },
                 "supports-color": {
-                  "version": "0.2.0"
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
                 }
               }
             },
             "dateformat": {
-              "version": "1.0.8"
+              "version": "1.0.11",
+              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "dependencies": {
+                "get-stdin": {
+                  "version": "4.0.1",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                },
+                "meow": {
+                  "version": "3.1.0",
+                  "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "dependencies": {
+                    "camelcase-keys": {
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                        },
+                        "map-obj": {
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "indent-string": {
+                      "version": "1.2.1",
+                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "dependencies": {
+                        "repeating": {
+                          "version": "1.1.2",
+                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                          "dependencies": {
+                            "is-finite": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "minimist": {
+                      "version": "1.1.1",
+                      "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+                    },
+                    "object-assign": {
+                      "version": "2.0.0",
+                      "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
+                    }
+                  }
+                }
+              }
             },
             "lodash._reinterpolate": {
-              "version": "2.4.1"
+              "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
             },
             "lodash.template": {
               "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
               "dependencies": {
                 "lodash.defaults": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
                   "dependencies": {
                     "lodash._objecttypes": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.escape": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
                   "dependencies": {
                     "lodash._escapehtmlchar": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._reunescapedhtml": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "lodash._escapestringchar": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"
                 },
                 "lodash.keys": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "lodash.templatesettings": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
                 },
                 "lodash.values": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"
                 }
               }
             },
             "minimist": {
-              "version": "0.2.0"
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "multipipe": {
-              "version": "0.1.1",
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
+                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
-                          "version": "0.0.1"
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
-                          "version": "0.10.31"
+                          "version": "0.10.31",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
-                          "version": "2.0.1"
+                          "version": "2.0.1",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
                     }
@@ -3385,34 +6867,52 @@
             },
             "through2": {
               "version": "0.5.1",
+              "from": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
               "dependencies": {
                 "readable-stream": {
-                  "version": "1.0.32",
+                  "version": "1.0.33",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
-                  "version": "3.0.0"
+                  "version": "3.0.0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.2.3",
+              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
               "dependencies": {
                 "clone-stats": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
             }
@@ -3420,119 +6920,183 @@
         },
         "lodash.clone": {
           "version": "2.4.1",
+          "from": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-2.4.1.tgz",
+          "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-2.4.1.tgz",
           "dependencies": {
             "lodash._baseclone": {
               "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-2.4.1.tgz",
               "dependencies": {
                 "lodash.assign": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz",
                   "dependencies": {
                     "lodash.keys": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                       "dependencies": {
                         "lodash._isnative": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                         },
                         "lodash._shimkeys": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._objecttypes": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.foreach": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.4.1.tgz"
                 },
                 "lodash.forown": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz",
                   "dependencies": {
                     "lodash.keys": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                       "dependencies": {
                         "lodash._isnative": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                         },
                         "lodash._shimkeys": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._objecttypes": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._getarray": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz",
                   "dependencies": {
                     "lodash._arraypool": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.isarray": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.isobject": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                   "dependencies": {
                     "lodash._objecttypes": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._releasearray": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz",
                   "dependencies": {
                     "lodash._arraypool": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz"
                     },
                     "lodash._maxpoolsize": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._slice": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"
                 }
               }
             },
             "lodash._basecreatecallback": {
               "version": "2.4.1",
+              "from": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz",
               "dependencies": {
                 "lodash.bind": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz",
                   "dependencies": {
                     "lodash._createwrapper": {
                       "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz",
                       "dependencies": {
                         "lodash._basebind": {
                           "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz",
                           "dependencies": {
                             "lodash._basecreate": {
                               "version": "2.4.1",
+                              "from": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
+                              "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
                               "dependencies": {
                                 "lodash._isnative": {
-                                  "version": "2.4.1"
+                                  "version": "2.4.1",
+                                  "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                                 },
                                 "lodash.noop": {
-                                  "version": "2.4.1"
+                                  "version": "2.4.1",
+                                  "from": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
                                 }
                               }
                             },
                             "lodash.isobject": {
                               "version": "2.4.1",
+                              "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                              "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                               "dependencies": {
                                 "lodash._objecttypes": {
-                                  "version": "2.4.1"
+                                  "version": "2.4.1",
+                                  "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                                 }
                               }
                             }
@@ -3540,57 +7104,85 @@
                         },
                         "lodash._basecreatewrapper": {
                           "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz",
                           "dependencies": {
                             "lodash._basecreate": {
                               "version": "2.4.1",
+                              "from": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
+                              "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
                               "dependencies": {
                                 "lodash._isnative": {
-                                  "version": "2.4.1"
+                                  "version": "2.4.1",
+                                  "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                                 },
                                 "lodash.noop": {
-                                  "version": "2.4.1"
+                                  "version": "2.4.1",
+                                  "from": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
                                 }
                               }
                             },
                             "lodash.isobject": {
                               "version": "2.4.1",
+                              "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                              "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                               "dependencies": {
                                 "lodash._objecttypes": {
-                                  "version": "2.4.1"
+                                  "version": "2.4.1",
+                                  "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                                 }
                               }
                             }
                           }
                         },
                         "lodash.isfunction": {
-                          "version": "2.4.1"
+                          "version": "2.4.1",
+                          "from": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._slice": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.identity": {
-                  "version": "2.4.1"
+                  "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz"
                 },
                 "lodash._setbinddata": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.noop": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.support": {
                   "version": "2.4.1",
+                  "from": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
-                      "version": "2.4.1"
+                      "version": "2.4.1",
+                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     }
                   }
                 }
@@ -3601,115 +7193,204 @@
       }
     },
     "gulp-rename": {
-      "version": "1.2.0"
+      "version": "1.2.2",
+      "from": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz"
     },
     "gulp-sourcemaps": {
-      "version": "1.2.2",
+      "version": "1.5.1",
+      "from": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.5.1.tgz",
       "dependencies": {
+        "convert-source-map": {
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.0.0.tgz"
+        },
+        "graceful-fs": {
+          "version": "3.0.6",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "dependencies": {
+            "first-chunk-stream": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+            },
+            "is-utf8": {
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+            }
+          }
+        },
         "through2": {
-          "version": "0.6.2",
+          "version": "0.6.3",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.32",
+              "version": "1.0.33",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31"
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
-              "version": "4.0.0"
+              "version": "4.0.0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
-          "version": "0.4.3",
+          "version": "0.4.6",
+          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
+            "clone": {
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+            },
             "clone-stats": {
-              "version": "0.0.1"
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
-        },
-        "convert-source-map": {
-          "version": "0.4.1"
         }
       }
     },
     "gulp-uglify": {
-      "version": "1.0.1",
+      "version": "1.1.0",
+      "from": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-1.1.0.tgz",
       "dependencies": {
         "deepmerge": {
-          "version": "0.2.7"
+          "version": "0.2.7",
+          "from": "https://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz",
+          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz"
         },
         "through2": {
-          "version": "0.6.2",
+          "version": "0.6.3",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.32",
+              "version": "1.0.33",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31"
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
-              "version": "4.0.0"
+              "version": "4.0.0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "uglify-js": {
-          "version": "2.4.15",
+          "version": "2.4.16",
+          "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz",
           "dependencies": {
             "async": {
-              "version": "0.2.10"
+              "version": "0.2.10",
+              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "source-map": {
               "version": "0.1.34",
+              "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
               "dependencies": {
                 "amdefine": {
-                  "version": "0.1.0"
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
                 }
               }
             },
             "optimist": {
               "version": "0.3.7",
+              "from": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
               "dependencies": {
                 "wordwrap": {
-                  "version": "0.0.2"
+                  "version": "0.0.2",
+                  "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
                 }
               }
             },
             "uglify-to-browserify": {
-              "version": "1.0.2"
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
             }
           }
         },
         "vinyl-sourcemaps-apply": {
-          "version": "0.1.3",
+          "version": "0.1.4",
+          "from": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz",
+          "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz",
           "dependencies": {
             "source-map": {
-              "version": "0.1.39",
+              "version": "0.1.43",
+              "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
               "dependencies": {
                 "amdefine": {
-                  "version": "0.1.0"
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
                 }
               }
             }
@@ -3718,134 +7399,249 @@
       }
     },
     "gulp-util": {
-      "version": "3.0.1",
+      "version": "3.0.4",
+      "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
       "dependencies": {
+        "array-differ": {
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+        },
+        "array-uniq": {
+          "version": "1.0.2",
+          "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
+        },
+        "beeper": {
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
+        },
         "chalk": {
-          "version": "0.5.1",
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
           "dependencies": {
             "ansi-styles": {
-              "version": "1.1.0"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
             },
             "escape-string-regexp": {
-              "version": "1.0.2"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
-              "version": "0.1.0",
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                },
+                "get-stdin": {
+                  "version": "4.0.1",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 }
               }
             },
             "strip-ansi": {
-              "version": "0.3.0",
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                 }
               }
             },
             "supports-color": {
-              "version": "0.2.0"
+              "version": "1.3.1",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
             }
           }
         },
         "dateformat": {
-          "version": "1.0.8"
-        },
-        "lodash._reinterpolate": {
-          "version": "2.4.1"
-        },
-        "lodash.template": {
-          "version": "2.4.1",
+          "version": "1.0.11",
+          "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
           "dependencies": {
-            "lodash.defaults": {
-              "version": "2.4.1",
-              "dependencies": {
-                "lodash._objecttypes": {
-                  "version": "2.4.1"
-                }
-              }
+            "get-stdin": {
+              "version": "4.0.1",
+              "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
             },
-            "lodash.escape": {
-              "version": "2.4.1",
+            "meow": {
+              "version": "3.1.0",
+              "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
               "dependencies": {
-                "lodash._escapehtmlchar": {
-                  "version": "2.4.1",
+                "camelcase-keys": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                   "dependencies": {
-                    "lodash._htmlescapes": {
-                      "version": "2.4.1"
+                    "camelcase": {
+                      "version": "1.0.2",
+                      "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                    },
+                    "map-obj": {
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                     }
                   }
                 },
-                "lodash._reunescapedhtml": {
-                  "version": "2.4.1",
+                "indent-string": {
+                  "version": "1.2.1",
+                  "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                   "dependencies": {
-                    "lodash._htmlescapes": {
-                      "version": "2.4.1"
+                    "repeating": {
+                      "version": "1.1.2",
+                      "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                      "dependencies": {
+                        "is-finite": {
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
+                        }
+                      }
                     }
                   }
                 }
               }
+            }
+          }
+        },
+        "lodash._reescape": {
+          "version": "3.0.0",
+          "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+        },
+        "lodash._reevaluate": {
+          "version": "3.0.0",
+          "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+        },
+        "lodash._reinterpolate": {
+          "version": "3.0.0",
+          "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+        },
+        "lodash.template": {
+          "version": "3.4.0",
+          "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.4.0.tgz",
+          "dependencies": {
+            "lodash._basecopy": {
+              "version": "3.0.0",
+              "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
+            },
+            "lodash._basetostring": {
+              "version": "3.0.0",
+              "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+            },
+            "lodash._basevalues": {
+              "version": "3.0.0",
+              "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
+            },
+            "lodash._isiterateecall": {
+              "version": "3.0.5",
+              "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.5.tgz",
+              "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.5.tgz"
             },
-            "lodash._escapestringchar": {
-              "version": "2.4.1"
+            "lodash.escape": {
+              "version": "3.0.0",
+              "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
             },
             "lodash.keys": {
-              "version": "2.4.1",
+              "version": "3.0.5",
+              "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.5.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.5.tgz",
               "dependencies": {
-                "lodash._isnative": {
-                  "version": "2.4.1"
+                "lodash.isarguments": {
+                  "version": "3.0.1",
+                  "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz"
                 },
-                "lodash.isobject": {
-                  "version": "2.4.1",
-                  "dependencies": {
-                    "lodash._objecttypes": {
-                      "version": "2.4.1"
-                    }
-                  }
+                "lodash.isarray": {
+                  "version": "3.0.1",
+                  "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.1.tgz"
                 },
-                "lodash._shimkeys": {
-                  "version": "2.4.1",
-                  "dependencies": {
-                    "lodash._objecttypes": {
-                      "version": "2.4.1"
-                    }
-                  }
+                "lodash.isnative": {
+                  "version": "3.0.1",
+                  "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.1.tgz"
                 }
               }
             },
-            "lodash.templatesettings": {
-              "version": "2.4.1"
+            "lodash.restparam": {
+              "version": "3.6.0",
+              "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.0.tgz"
             },
-            "lodash.values": {
-              "version": "2.4.1"
+            "lodash.templatesettings": {
+              "version": "3.1.0",
+              "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
             }
           }
         },
         "minimist": {
-          "version": "1.1.0"
+          "version": "1.1.1",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "multipipe": {
-          "version": "0.1.1",
+          "version": "0.1.2",
+          "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
           "dependencies": {
             "duplexer2": {
               "version": "0.0.2",
+              "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.1.13",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 }
@@ -3853,36 +7649,69 @@
             }
           }
         },
+        "object-assign": {
+          "version": "2.0.0",
+          "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
+        },
+        "replace-ext": {
+          "version": "0.0.1",
+          "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
+        },
         "through2": {
-          "version": "0.6.2",
+          "version": "0.6.3",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.32",
+              "version": "1.0.33",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31"
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
-              "version": "4.0.0"
+              "version": "4.0.0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
-          "version": "0.4.3",
+          "version": "0.4.6",
+          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
+            "clone": {
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+            },
             "clone-stats": {
-              "version": "0.0.1"
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
         }
@@ -3890,58 +7719,92 @@
     },
     "jasmine-node": {
       "version": "1.14.5",
+      "from": "https://registry.npmjs.org/jasmine-node/-/jasmine-node-1.14.5.tgz",
+      "resolved": "https://registry.npmjs.org/jasmine-node/-/jasmine-node-1.14.5.tgz",
       "dependencies": {
         "coffee-script": {
-          "version": "1.8.0"
+          "version": "1.9.1",
+          "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.9.1.tgz",
+          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.9.1.tgz"
         },
         "jasmine-growl-reporter": {
           "version": "0.0.3",
+          "from": "https://registry.npmjs.org/jasmine-growl-reporter/-/jasmine-growl-reporter-0.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/jasmine-growl-reporter/-/jasmine-growl-reporter-0.0.3.tgz",
           "dependencies": {
             "growl": {
-              "version": "1.7.0"
+              "version": "1.7.0",
+              "from": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz",
+              "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz"
             }
           }
         },
         "requirejs": {
-          "version": "2.1.15"
+          "version": "2.1.17",
+          "from": "https://registry.npmjs.org/requirejs/-/requirejs-2.1.17.tgz",
+          "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.1.17.tgz"
         },
         "walkdir": {
-          "version": "0.0.7"
+          "version": "0.0.7",
+          "from": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.7.tgz",
+          "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.7.tgz"
         },
         "underscore": {
-          "version": "1.7.0"
+          "version": "1.8.3",
+          "from": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
         },
         "gaze": {
           "version": "0.3.4",
+          "from": "https://registry.npmjs.org/gaze/-/gaze-0.3.4.tgz",
+          "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.3.4.tgz",
           "dependencies": {
             "minimatch": {
               "version": "0.2.14",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.5.0"
+                  "version": "2.5.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "fileset": {
               "version": "0.1.5",
+              "from": "https://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz",
+              "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
+                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0"
+                          "version": "2.5.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
-                          "version": "1.0.0"
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
                     }
@@ -3952,186 +7815,753 @@
           }
         },
         "mkdirp": {
-          "version": "0.3.5"
+          "version": "0.3.5",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
         }
       }
     },
     "jasmine-reporters": {
       "version": "1.0.1",
+      "from": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-1.0.1.tgz",
       "dependencies": {
         "mkdirp": {
-          "version": "0.3.5"
+          "version": "0.3.5",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
         }
       }
     },
     "jshint-stylish": {
-      "version": "1.0.0",
+      "version": "1.0.1",
+      "from": "https://registry.npmjs.org/jshint-stylish/-/jshint-stylish-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/jshint-stylish/-/jshint-stylish-1.0.1.tgz",
       "dependencies": {
         "chalk": {
-          "version": "0.5.1",
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
           "dependencies": {
             "ansi-styles": {
-              "version": "1.1.0"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
             },
             "escape-string-regexp": {
-              "version": "1.0.2"
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
-              "version": "0.1.0",
+              "version": "1.0.3",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                },
+                "get-stdin": {
+                  "version": "4.0.1",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 }
               }
             },
             "strip-ansi": {
-              "version": "0.3.0",
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.2.1"
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                 }
               }
             },
             "supports-color": {
-              "version": "0.2.0"
+              "version": "1.3.1",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
             }
           }
         },
         "log-symbols": {
-          "version": "1.0.1"
+          "version": "1.0.2",
+          "from": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"
         },
         "string-length": {
           "version": "1.0.0",
+          "from": "https://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz",
           "dependencies": {
             "strip-ansi": {
-              "version": "2.0.0",
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "1.1.0"
+                  "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                 }
               }
             }
           }
         },
         "text-table": {
-          "version": "0.2.0"
+          "version": "0.2.0",
+          "from": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
         }
       }
     },
     "karma": {
-      "version": "0.12.23",
+      "version": "0.12.32",
+      "from": "https://registry.npmjs.org/karma/-/karma-0.12.32.tgz",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-0.12.32.tgz",
       "dependencies": {
         "di": {
-          "version": "0.0.1"
+          "version": "0.0.1",
+          "from": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz"
         },
         "socket.io": {
-          "version": "0.9.16",
+          "version": "1.3.5",
+          "from": "https://registry.npmjs.org/socket.io/-/socket.io-1.3.5.tgz",
+          "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.3.5.tgz",
           "dependencies": {
+            "engine.io": {
+              "version": "1.5.1",
+              "from": "https://registry.npmjs.org/engine.io/-/engine.io-1.5.1.tgz",
+              "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.5.1.tgz",
+              "dependencies": {
+                "debug": {
+                  "version": "1.0.3",
+                  "from": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
+                  "dependencies": {
+                    "ms": {
+                      "version": "0.6.2",
+                      "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                      "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                    }
+                  }
+                },
+                "ws": {
+                  "version": "0.5.0",
+                  "from": "https://registry.npmjs.org/ws/-/ws-0.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/ws/-/ws-0.5.0.tgz",
+                  "dependencies": {
+                    "nan": {
+                      "version": "1.4.3",
+                      "from": "https://registry.npmjs.org/nan/-/nan-1.4.3.tgz",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.3.tgz"
+                    },
+                    "options": {
+                      "version": "0.0.6",
+                      "from": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
+                      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
+                    },
+                    "ultron": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"
+                    }
+                  }
+                },
+                "engine.io-parser": {
+                  "version": "1.2.1",
+                  "from": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.1.tgz",
+                  "dependencies": {
+                    "after": {
+                      "version": "0.8.1",
+                      "from": "https://registry.npmjs.org/after/-/after-0.8.1.tgz",
+                      "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz"
+                    },
+                    "arraybuffer.slice": {
+                      "version": "0.0.6",
+                      "from": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
+                      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"
+                    },
+                    "base64-arraybuffer": {
+                      "version": "0.1.2",
+                      "from": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz",
+                      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"
+                    },
+                    "blob": {
+                      "version": "0.0.2",
+                      "from": "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz"
+                    },
+                    "has-binary": {
+                      "version": "0.1.5",
+                      "from": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.5.tgz",
+                      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.5.tgz",
+                      "dependencies": {
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        }
+                      }
+                    },
+                    "utf8": {
+                      "version": "2.0.0",
+                      "from": "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz"
+                    }
+                  }
+                },
+                "base64id": {
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"
+                }
+              }
+            },
+            "socket.io-parser": {
+              "version": "2.2.4",
+              "from": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.4.tgz",
+              "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.4.tgz",
+              "dependencies": {
+                "debug": {
+                  "version": "0.7.4",
+                  "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+                },
+                "json3": {
+                  "version": "3.2.6",
+                  "from": "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz",
+                  "resolved": "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"
+                },
+                "component-emitter": {
+                  "version": "1.1.2",
+                  "from": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+                  "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                }
+              }
+            },
             "socket.io-client": {
-              "version": "0.9.16",
+              "version": "1.3.5",
+              "from": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.3.5.tgz",
+              "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.3.5.tgz",
+              "dependencies": {
+                "debug": {
+                  "version": "0.7.4",
+                  "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+                },
+                "engine.io-client": {
+                  "version": "1.5.1",
+                  "from": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.5.1.tgz",
+                  "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.5.1.tgz",
+                  "dependencies": {
+                    "has-cors": {
+                      "version": "1.0.3",
+                      "from": "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz",
+                      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz",
+                      "dependencies": {
+                        "global": {
+                          "version": "2.0.1",
+                          "from": "https://github.com/component/global/archive/v2.0.1.tar.gz",
+                          "resolved": "https://github.com/component/global/archive/v2.0.1.tar.gz"
+                        }
+                      }
+                    },
+                    "ws": {
+                      "version": "0.4.31",
+                      "from": "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz",
+                      "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz",
+                      "dependencies": {
+                        "commander": {
+                          "version": "0.6.1",
+                          "from": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+                          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"
+                        },
+                        "nan": {
+                          "version": "0.3.2",
+                          "from": "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz",
+                          "resolved": "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz"
+                        },
+                        "tinycolor": {
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"
+                        },
+                        "options": {
+                          "version": "0.0.6",
+                          "from": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
+                          "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
+                        }
+                      }
+                    },
+                    "xmlhttprequest": {
+                      "version": "1.5.0",
+                      "from": "https://github.com/rase-/node-XMLHttpRequest/archive/a6b6f2.tar.gz",
+                      "resolved": "https://github.com/rase-/node-XMLHttpRequest/archive/a6b6f2.tar.gz"
+                    },
+                    "engine.io-parser": {
+                      "version": "1.2.1",
+                      "from": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.1.tgz",
+                      "dependencies": {
+                        "after": {
+                          "version": "0.8.1",
+                          "from": "https://registry.npmjs.org/after/-/after-0.8.1.tgz",
+                          "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz"
+                        },
+                        "arraybuffer.slice": {
+                          "version": "0.0.6",
+                          "from": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
+                          "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"
+                        },
+                        "base64-arraybuffer": {
+                          "version": "0.1.2",
+                          "from": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz",
+                          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"
+                        },
+                        "blob": {
+                          "version": "0.0.2",
+                          "from": "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz"
+                        },
+                        "has-binary": {
+                          "version": "0.1.5",
+                          "from": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.5.tgz",
+                          "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.5.tgz",
+                          "dependencies": {
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            }
+                          }
+                        },
+                        "utf8": {
+                          "version": "2.0.0",
+                          "from": "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "debug": {
+                      "version": "1.0.4",
+                      "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+                      "dependencies": {
+                        "ms": {
+                          "version": "0.6.2",
+                          "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                          "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                        }
+                      }
+                    },
+                    "parseuri": {
+                      "version": "0.0.4",
+                      "from": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz",
+                      "dependencies": {
+                        "better-assert": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+                          "dependencies": {
+                            "callsite": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "parsejson": {
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz",
+                      "dependencies": {
+                        "better-assert": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+                          "dependencies": {
+                            "callsite": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "parseqs": {
+                      "version": "0.0.2",
+                      "from": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz",
+                      "dependencies": {
+                        "better-assert": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+                          "dependencies": {
+                            "callsite": {
+                              "version": "1.0.0",
+                              "from": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "component-inherit": {
+                      "version": "0.0.3",
+                      "from": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+                      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"
+                    }
+                  }
+                },
+                "component-bind": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"
+                },
+                "component-emitter": {
+                  "version": "1.1.2",
+                  "from": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+                  "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"
+                },
+                "object-component": {
+                  "version": "0.0.3",
+                  "from": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"
+                },
+                "has-binary": {
+                  "version": "0.1.6",
+                  "from": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz",
+                  "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz",
+                  "dependencies": {
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    }
+                  }
+                },
+                "indexof": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                },
+                "parseuri": {
+                  "version": "0.0.2",
+                  "from": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz",
+                  "dependencies": {
+                    "better-assert": {
+                      "version": "1.0.2",
+                      "from": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+                      "dependencies": {
+                        "callsite": {
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "to-array": {
+                  "version": "0.1.3",
+                  "from": "https://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz",
+                  "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz"
+                },
+                "backo2": {
+                  "version": "1.0.2",
+                  "from": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"
+                }
+              }
+            },
+            "socket.io-adapter": {
+              "version": "0.3.1",
+              "from": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.3.1.tgz",
               "dependencies": {
-                "uglify-js": {
-                  "version": "1.2.5"
+                "debug": {
+                  "version": "1.0.2",
+                  "from": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
+                  "dependencies": {
+                    "ms": {
+                      "version": "0.6.2",
+                      "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                      "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                    }
+                  }
                 },
-                "ws": {
-                  "version": "0.4.31",
+                "socket.io-parser": {
+                  "version": "2.2.2",
+                  "from": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz",
+                  "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz",
                   "dependencies": {
-                    "commander": {
-                      "version": "0.6.1"
+                    "debug": {
+                      "version": "0.7.4",
+                      "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+                      "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
                     },
-                    "nan": {
-                      "version": "0.3.2"
+                    "json3": {
+                      "version": "3.2.6",
+                      "from": "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz",
+                      "resolved": "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"
                     },
-                    "tinycolor": {
-                      "version": "0.0.1"
+                    "component-emitter": {
+                      "version": "1.1.2",
+                      "from": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+                      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"
                     },
-                    "options": {
-                      "version": "0.0.5"
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     }
                   }
                 },
-                "xmlhttprequest": {
-                  "version": "1.4.2"
-                },
-                "active-x-obfuscator": {
-                  "version": "0.0.1",
-                  "dependencies": {
-                    "zeparser": {
-                      "version": "0.0.5"
-                    }
-                  }
+                "object-keys": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.1.tgz"
                 }
               }
             },
-            "policyfile": {
-              "version": "0.0.4"
-            },
-            "base64id": {
-              "version": "0.1.0"
+            "has-binary-data": {
+              "version": "0.1.3",
+              "from": "https://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.3.tgz",
+              "resolved": "https://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.3.tgz",
+              "dependencies": {
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                }
+              }
             },
-            "redis": {
-              "version": "0.7.3"
+            "debug": {
+              "version": "2.1.0",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                }
+              }
             }
           }
         },
         "chokidar": {
-          "version": "0.8.2",
+          "version": "0.12.6",
+          "from": "https://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz",
           "dependencies": {
+            "readdirp": {
+              "version": "1.3.0",
+              "from": "https://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "async-each": {
+              "version": "0.1.6",
+              "from": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz",
+              "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
+            },
             "fsevents": {
-              "version": "0.2.0",
+              "version": "0.3.5",
+              "from": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz",
+              "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz",
               "dependencies": {
                 "nan": {
-                  "version": "0.8.0"
+                  "version": "1.5.3",
+                  "from": "https://registry.npmjs.org/nan/-/nan-1.5.3.tgz",
+                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.5.3.tgz"
                 }
               }
-            },
-            "recursive-readdir": {
-              "version": "0.0.2"
             }
           }
         },
         "glob": {
-          "version": "3.2.9",
+          "version": "3.2.11",
+          "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
           "dependencies": {
             "inherits": {
-              "version": "2.0.1"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            },
+            "minimatch": {
+              "version": "0.3.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                },
+                "sigmund": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                }
+              }
             }
           }
         },
         "minimatch": {
           "version": "0.2.14",
+          "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
           "dependencies": {
             "lru-cache": {
-              "version": "2.5.0"
+              "version": "2.5.0",
+              "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
             },
             "sigmund": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+            }
+          }
+        },
+        "expand-braces": {
+          "version": "0.1.1",
+          "from": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.1.tgz",
+          "dependencies": {
+            "array-slice": {
+              "version": "0.2.2",
+              "from": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.2.tgz",
+              "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.2.tgz"
+            },
+            "array-uniq": {
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
+            },
+            "braces": {
+              "version": "0.1.5",
+              "from": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+              "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+              "dependencies": {
+                "expand-range": {
+                  "version": "0.1.1",
+                  "from": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+                  "dependencies": {
+                    "is-number": {
+                      "version": "0.1.1",
+                      "from": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"
+                    },
+                    "repeat-string": {
+                      "version": "0.2.2",
+                      "from": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
+                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"
+                    }
+                  }
+                }
+              }
             }
           }
         },
         "http-proxy": {
           "version": "0.10.4",
+          "from": "https://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz",
+          "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz",
           "dependencies": {
             "pkginfo": {
-              "version": "0.3.0"
+              "version": "0.3.0",
+              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
             },
             "utile": {
               "version": "0.2.1",
+              "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
               "dependencies": {
                 "async": {
-                  "version": "0.2.10"
+                  "version": "0.2.10",
+                  "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
                 },
                 "deep-equal": {
-                  "version": "0.2.1"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
                 },
                 "i": {
-                  "version": "0.3.2"
+                  "version": "0.3.3",
+                  "from": "https://registry.npmjs.org/i/-/i-0.3.3.tgz",
+                  "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
                 },
                 "mkdirp": {
-                  "version": "0.4.0"
+                  "version": "0.5.0",
+                  "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
                 },
                 "ncp": {
-                  "version": "0.4.2"
+                  "version": "0.4.2",
+                  "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+                  "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
                 }
               }
             }
@@ -4139,371 +8569,950 @@
         },
         "optimist": {
           "version": "0.6.1",
+          "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "dependencies": {
             "wordwrap": {
-              "version": "0.0.2"
+              "version": "0.0.2",
+              "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
             },
             "minimist": {
-              "version": "0.0.8"
+              "version": "0.0.10",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
             }
           }
         },
         "rimraf": {
-          "version": "2.2.6"
+          "version": "2.2.8",
+          "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
         },
         "q": {
-          "version": "0.9.7"
+          "version": "0.9.7",
+          "from": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
+          "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz"
         },
         "colors": {
-          "version": "0.6.2"
+          "version": "0.6.2",
+          "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
         },
         "mime": {
-          "version": "1.2.11"
+          "version": "1.2.11",
+          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "log4js": {
-          "version": "0.6.14",
+          "version": "0.6.22",
+          "from": "https://registry.npmjs.org/log4js/-/log4js-0.6.22.tgz",
+          "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.22.tgz",
           "dependencies": {
             "async": {
-              "version": "0.1.15"
-            },
-            "semver": {
-              "version": "1.1.4"
+              "version": "0.2.10",
+              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "readable-stream": {
-              "version": "1.0.32",
+              "version": "1.0.33",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
-                  "version": "0.0.1"
+                  "version": "0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31"
+                  "version": "0.10.31",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
+            },
+            "semver": {
+              "version": "1.1.4",
+              "from": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz"
             }
           }
         },
         "useragent": {
-          "version": "2.0.8",
+          "version": "2.0.10",
+          "from": "https://registry.npmjs.org/useragent/-/useragent-2.0.10.tgz",
+          "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.0.10.tgz",
           "dependencies": {
             "lru-cache": {
-              "version": "2.2.4"
+              "version": "2.2.4",
+              "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"
             }
           }
         },
         "graceful-fs": {
-          "version": "2.0.3"
+          "version": "2.0.3",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
         },
         "connect": {
-          "version": "2.12.0",
+          "version": "2.26.6",
+          "from": "https://registry.npmjs.org/connect/-/connect-2.26.6.tgz",
+          "resolved": "https://registry.npmjs.org/connect/-/connect-2.26.6.tgz",
           "dependencies": {
-            "batch": {
-              "version": "0.5.0"
-            },
-            "qs": {
-              "version": "0.6.6"
+            "basic-auth-connect": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"
             },
-            "cookie-signature": {
-              "version": "1.0.1"
+            "body-parser": {
+              "version": "1.8.4",
+              "from": "https://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz",
+              "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz",
+              "dependencies": {
+                "iconv-lite": {
+                  "version": "0.4.4",
+                  "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz",
+                  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"
+                },
+                "on-finished": {
+                  "version": "2.1.0",
+                  "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
+                  "dependencies": {
+                    "ee-first": {
+                      "version": "1.0.5",
+                      "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"
+                    }
+                  }
+                },
+                "raw-body": {
+                  "version": "1.3.0",
+                  "from": "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"
+                }
+              }
             },
-            "buffer-crc32": {
-              "version": "0.2.1"
+            "bytes": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
             },
             "cookie": {
-              "version": "0.1.0"
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"
             },
-            "send": {
-              "version": "0.1.4",
+            "cookie-parser": {
+              "version": "1.3.4",
+              "from": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz",
+              "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz",
               "dependencies": {
-                "range-parser": {
-                  "version": "0.0.4"
+                "cookie-signature": {
+                  "version": "1.0.6",
+                  "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
                 }
               }
             },
-            "bytes": {
-              "version": "0.2.1"
+            "cookie-signature": {
+              "version": "1.0.5",
+              "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz",
+              "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"
             },
-            "fresh": {
-              "version": "0.2.0"
+            "compression": {
+              "version": "1.1.2",
+              "from": "https://registry.npmjs.org/compression/-/compression-1.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/compression/-/compression-1.1.2.tgz",
+              "dependencies": {
+                "accepts": {
+                  "version": "1.1.4",
+                  "from": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz",
+                  "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz",
+                  "dependencies": {
+                    "mime-types": {
+                      "version": "2.0.10",
+                      "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.8.0",
+                          "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
+                        }
+                      }
+                    },
+                    "negotiator": {
+                      "version": "0.4.9",
+                      "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz",
+                      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"
+                    }
+                  }
+                },
+                "compressible": {
+                  "version": "2.0.2",
+                  "from": "https://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.8.0",
+                      "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
+                    }
+                  }
+                },
+                "vary": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/vary/-/vary-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.0.tgz"
+                }
+              }
             },
-            "pause": {
-              "version": "0.0.1"
+            "connect-timeout": {
+              "version": "1.3.0",
+              "from": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                }
+              }
             },
-            "uid2": {
-              "version": "0.0.3"
+            "csurf": {
+              "version": "1.6.6",
+              "from": "https://registry.npmjs.org/csurf/-/csurf-1.6.6.tgz",
+              "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.6.6.tgz",
+              "dependencies": {
+                "csrf": {
+                  "version": "2.0.6",
+                  "from": "https://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz",
+                  "dependencies": {
+                    "base64-url": {
+                      "version": "1.2.1",
+                      "from": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"
+                    },
+                    "rndm": {
+                      "version": "1.1.0",
+                      "from": "https://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz"
+                    },
+                    "scmp": {
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"
+                    },
+                    "uid-safe": {
+                      "version": "1.1.0",
+                      "from": "https://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz",
+                      "dependencies": {
+                        "native-or-bluebird": {
+                          "version": "1.1.2",
+                          "from": "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz",
+                          "resolved": "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "http-errors": {
+                  "version": "1.2.8",
+                  "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz",
+                  "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "statuses": {
+                      "version": "1.2.1",
+                      "from": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
+                    }
+                  }
+                }
+              }
             },
             "debug": {
-              "version": "0.8.0"
-            },
-            "methods": {
-              "version": "0.1.0"
-            },
-            "raw-body": {
-              "version": "1.1.2"
+              "version": "2.0.0",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                }
+              }
             },
-            "negotiator": {
-              "version": "0.3.0"
+            "depd": {
+              "version": "0.4.5",
+              "from": "https://registry.npmjs.org/depd/-/depd-0.4.5.tgz",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-0.4.5.tgz"
             },
-            "multiparty": {
-              "version": "2.2.0",
+            "errorhandler": {
+              "version": "1.2.4",
+              "from": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.2.4.tgz",
+              "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.2.4.tgz",
               "dependencies": {
-                "readable-stream": {
-                  "version": "1.1.13",
+                "accepts": {
+                  "version": "1.1.4",
+                  "from": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz",
+                  "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz",
                   "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1"
-                    },
-                    "isarray": {
-                      "version": "0.0.1"
+                    "mime-types": {
+                      "version": "2.0.10",
+                      "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.8.0",
+                          "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
+                        }
+                      }
                     },
-                    "string_decoder": {
-                      "version": "0.10.31"
+                    "negotiator": {
+                      "version": "0.4.9",
+                      "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz",
+                      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"
+                    }
+                  }
+                },
+                "escape-html": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+                }
+              }
+            },
+            "express-session": {
+              "version": "1.8.2",
+              "from": "https://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz",
+              "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz",
+              "dependencies": {
+                "crc": {
+                  "version": "3.0.0",
+                  "from": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz"
+                },
+                "uid-safe": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz",
+                  "dependencies": {
+                    "mz": {
+                      "version": "1.3.0",
+                      "from": "https://registry.npmjs.org/mz/-/mz-1.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/mz/-/mz-1.3.0.tgz",
+                      "dependencies": {
+                        "native-or-bluebird": {
+                          "version": "1.2.0",
+                          "from": "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz",
+                          "resolved": "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz"
+                        },
+                        "thenify": {
+                          "version": "3.1.0",
+                          "from": "https://registry.npmjs.org/thenify/-/thenify-3.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.1.0.tgz"
+                        },
+                        "thenify-all": {
+                          "version": "1.6.0",
+                          "from": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+                          "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"
+                        }
+                      }
                     },
-                    "inherits": {
-                      "version": "2.0.1"
+                    "base64-url": {
+                      "version": "1.2.1",
+                      "from": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"
                     }
                   }
                 },
-                "stream-counter": {
-                  "version": "0.2.0"
+                "utils-merge": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
                 }
               }
-            }
-          }
-        },
-        "source-map": {
-          "version": "0.1.33",
-          "dependencies": {
-            "amdefine": {
-              "version": "0.1.0"
-            }
-          }
-        }
-      }
-    },
-    "karma-browserstack-launcher": {
-      "version": "0.1.1",
-      "dependencies": {
-        "browserstack": {
-          "version": "1.0.1"
-        },
-        "browserstacktunnel-wrapper": {
-          "version": "1.2.1",
-          "dependencies": {
-            "unzip": {
-              "version": "0.1.11",
+            },
+            "finalhandler": {
+              "version": "0.2.0",
+              "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+              "dependencies": {
+                "escape-html": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+                }
+              }
+            },
+            "fresh": {
+              "version": "0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
+            },
+            "media-typer": {
+              "version": "0.3.0",
+              "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
+            },
+            "method-override": {
+              "version": "2.2.0",
+              "from": "https://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz",
+              "dependencies": {
+                "methods": {
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz"
+                },
+                "vary": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/vary/-/vary-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.0.tgz"
+                }
+              }
+            },
+            "morgan": {
+              "version": "1.3.2",
+              "from": "https://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz",
+              "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz",
+              "dependencies": {
+                "basic-auth": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz"
+                },
+                "on-finished": {
+                  "version": "2.1.0",
+                  "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
+                  "dependencies": {
+                    "ee-first": {
+                      "version": "1.0.5",
+                      "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "multiparty": {
+              "version": "3.3.2",
+              "from": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz",
+              "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz",
               "dependencies": {
-                "fstream": {
-                  "version": "0.1.31",
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                   "dependencies": {
-                    "graceful-fs": {
-                      "version": "3.0.3"
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
-                    "inherits": {
-                      "version": "2.0.1"
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
-                    "mkdirp": {
-                      "version": "0.5.0",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "0.0.8"
-                        }
-                      }
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
-                    "rimraf": {
-                      "version": "2.2.8"
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
-                "pullstream": {
-                  "version": "0.4.1",
+                "stream-counter": {
+                  "version": "0.2.0",
+                  "from": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"
+                }
+              }
+            },
+            "on-headers": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz"
+            },
+            "parseurl": {
+              "version": "1.3.0",
+              "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+            },
+            "qs": {
+              "version": "2.2.4",
+              "from": "https://registry.npmjs.org/qs/-/qs-2.2.4.tgz",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-2.2.4.tgz"
+            },
+            "response-time": {
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz"
+            },
+            "serve-favicon": {
+              "version": "2.1.7",
+              "from": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz",
+              "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz",
+              "dependencies": {
+                "etag": {
+                  "version": "1.5.1",
+                  "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
+                  "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
                   "dependencies": {
-                    "over": {
-                      "version": "0.0.5"
-                    },
-                    "slice-stream": {
-                      "version": "1.0.0"
+                    "crc": {
+                      "version": "3.2.1",
+                      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
                     }
                   }
                 },
-                "binary": {
-                  "version": "0.3.0",
+                "ms": {
+                  "version": "0.6.2",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                }
+              }
+            },
+            "serve-index": {
+              "version": "1.2.1",
+              "from": "https://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz",
+              "dependencies": {
+                "accepts": {
+                  "version": "1.1.4",
+                  "from": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz",
+                  "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz",
                   "dependencies": {
-                    "chainsaw": {
-                      "version": "0.1.0",
+                    "mime-types": {
+                      "version": "2.0.10",
+                      "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
                       "dependencies": {
-                        "traverse": {
-                          "version": "0.3.9"
+                        "mime-db": {
+                          "version": "1.8.0",
+                          "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
                         }
                       }
                     },
-                    "buffers": {
-                      "version": "0.1.1"
+                    "negotiator": {
+                      "version": "0.4.9",
+                      "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz",
+                      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"
                     }
                   }
                 },
-                "readable-stream": {
-                  "version": "1.0.32",
+                "batch": {
+                  "version": "0.5.1",
+                  "from": "https://registry.npmjs.org/batch/-/batch-0.5.1.tgz",
+                  "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.1.tgz"
+                }
+              }
+            },
+            "serve-static": {
+              "version": "1.6.5",
+              "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.5.tgz",
+              "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.5.tgz",
+              "dependencies": {
+                "escape-html": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+                },
+                "send": {
+                  "version": "0.9.3",
+                  "from": "https://registry.npmjs.org/send/-/send-0.9.3.tgz",
+                  "resolved": "https://registry.npmjs.org/send/-/send-0.9.3.tgz",
                   "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1"
+                    "destroy": {
+                      "version": "1.0.3",
+                      "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
+                      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
                     },
-                    "isarray": {
-                      "version": "0.0.1"
+                    "etag": {
+                      "version": "1.4.0",
+                      "from": "https://registry.npmjs.org/etag/-/etag-1.4.0.tgz",
+                      "resolved": "https://registry.npmjs.org/etag/-/etag-1.4.0.tgz",
+                      "dependencies": {
+                        "crc": {
+                          "version": "3.0.0",
+                          "from": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz"
+                        }
+                      }
                     },
-                    "string_decoder": {
-                      "version": "0.10.31"
+                    "ms": {
+                      "version": "0.6.2",
+                      "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                      "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
                     },
-                    "inherits": {
-                      "version": "2.0.1"
+                    "on-finished": {
+                      "version": "2.1.0",
+                      "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
+                      "dependencies": {
+                        "ee-first": {
+                          "version": "1.0.5",
+                          "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz",
+                          "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"
+                        }
+                      }
+                    },
+                    "range-parser": {
+                      "version": "1.0.2",
+                      "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
                     }
                   }
                 },
-                "setimmediate": {
-                  "version": "1.0.2"
-                },
-                "match-stream": {
-                  "version": "0.0.2",
+                "utils-merge": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+                }
+              }
+            },
+            "type-is": {
+              "version": "1.5.7",
+              "from": "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz",
+              "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz",
+              "dependencies": {
+                "mime-types": {
+                  "version": "2.0.10",
+                  "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
                   "dependencies": {
-                    "buffers": {
-                      "version": "0.1.1"
+                    "mime-db": {
+                      "version": "1.8.0",
+                      "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
                     }
                   }
                 }
               }
             },
-            "fs-extra": {
-              "version": "0.8.1",
+            "vhost": {
+              "version": "3.0.0",
+              "from": "https://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz"
+            },
+            "pause": {
+              "version": "0.0.1",
+              "from": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"
+            }
+          }
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "dependencies": {
+            "amdefine": {
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+            }
+          }
+        },
+        "memoizee": {
+          "version": "0.3.8",
+          "from": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz",
+          "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz",
+          "dependencies": {
+            "d": {
+              "version": "0.1.1",
+              "from": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz"
+            },
+            "es5-ext": {
+              "version": "0.10.6",
+              "from": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz",
+              "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz",
               "dependencies": {
-                "ncp": {
-                  "version": "0.4.2"
+                "es6-iterator": {
+                  "version": "0.1.3",
+                  "from": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                  "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz"
                 },
-                "mkdirp": {
-                  "version": "0.3.5"
-                },
-                "jsonfile": {
-                  "version": "1.1.1"
+                "es6-symbol": {
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz"
+                }
+              }
+            },
+            "es6-weak-map": {
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz",
+              "dependencies": {
+                "es6-iterator": {
+                  "version": "0.1.3",
+                  "from": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                  "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+                  "dependencies": {
+                    "es6-symbol": {
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz"
+                    }
+                  }
                 },
-                "rimraf": {
-                  "version": "2.2.8"
+                "es6-symbol": {
+                  "version": "0.1.1",
+                  "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz"
                 }
               }
+            },
+            "event-emitter": {
+              "version": "0.3.3",
+              "from": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz",
+              "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz"
+            },
+            "lru-queue": {
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"
+            },
+            "next-tick": {
+              "version": "0.2.2",
+              "from": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
+              "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"
+            },
+            "timers-ext": {
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz"
             }
           }
+        }
+      }
+    },
+    "karma-browserstack-launcher": {
+      "version": "0.1.2",
+      "from": "https://registry.npmjs.org/karma-browserstack-launcher/-/karma-browserstack-launcher-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/karma-browserstack-launcher/-/karma-browserstack-launcher-0.1.2.tgz",
+      "dependencies": {
+        "browserstack": {
+          "version": "1.0.1",
+          "from": "https://registry.npmjs.org/browserstack/-/browserstack-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.0.1.tgz"
         },
         "q": {
-          "version": "0.9.7"
+          "version": "0.9.7",
+          "from": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
+          "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz"
         }
       }
     },
     "karma-chrome-launcher": {
-      "version": "0.1.5"
+      "version": "0.1.5",
+      "from": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.5.tgz"
     },
     "karma-firefox-launcher": {
-      "version": "0.1.3"
+      "version": "0.1.3",
+      "from": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.3.tgz"
     },
     "karma-jasmine": {
-      "version": "0.1.5"
+      "version": "0.1.5",
+      "from": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.5.tgz"
     },
     "karma-junit-reporter": {
       "version": "0.2.2",
+      "from": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz",
       "dependencies": {
         "xmlbuilder": {
-          "version": "0.4.2"
+          "version": "0.4.2",
+          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"
         }
       }
     },
     "karma-ng-scenario": {
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "from": "https://registry.npmjs.org/karma-ng-scenario/-/karma-ng-scenario-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/karma-ng-scenario/-/karma-ng-scenario-0.1.0.tgz"
     },
     "karma-sauce-launcher": {
       "version": "0.2.10",
+      "from": "https://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz",
+      "resolved": "https://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz",
       "dependencies": {
         "wd": {
-          "version": "0.3.9",
+          "version": "0.3.11",
+          "from": "https://registry.npmjs.org/wd/-/wd-0.3.11.tgz",
+          "resolved": "https://registry.npmjs.org/wd/-/wd-0.3.11.tgz",
           "dependencies": {
             "archiver": {
-              "version": "0.11.0",
+              "version": "0.12.0",
+              "from": "https://registry.npmjs.org/archiver/-/archiver-0.12.0.tgz",
+              "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.12.0.tgz",
               "dependencies": {
                 "buffer-crc32": {
-                  "version": "0.2.3"
+                  "version": "0.2.5",
+                  "from": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz",
+                  "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
                 },
                 "glob": {
-                  "version": "3.2.11",
+                  "version": "4.0.6",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
                   "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.6",
+                      "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+                    },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "0.3.0",
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0"
+                          "version": "2.5.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
-                          "version": "1.0.0"
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "lazystream": {
-                  "version": "0.1.0"
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
                 },
                 "readable-stream": {
-                  "version": "1.0.32",
+                  "version": "1.0.33",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1"
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
-                      "version": "0.0.1"
+                      "version": "0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
-                      "version": "0.10.31"
+                      "version": "0.10.31",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
-                      "version": "2.0.1"
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "tar-stream": {
-                  "version": "0.4.7",
+                  "version": "1.0.2",
+                  "from": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.0.2.tgz",
                   "dependencies": {
                     "bl": {
-                      "version": "0.9.3"
+                      "version": "0.9.4",
+                      "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                      "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz"
                     },
                     "end-of-stream": {
                       "version": "1.1.0",
+                      "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
                       "dependencies": {
                         "once": {
                           "version": "1.3.1",
+                          "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                           "dependencies": {
                             "wrappy": {
-                              "version": "1.0.1"
+                              "version": "1.0.1",
+                              "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                             }
                           }
                         }
                       }
                     },
                     "xtend": {
-                      "version": "4.0.0"
+                      "version": "4.0.0",
+                      "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                     }
                   }
                 },
                 "zip-stream": {
                   "version": "0.4.1",
+                  "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz",
                   "dependencies": {
                     "compress-commons": {
                       "version": "0.1.6",
+                      "from": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz",
+                      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz",
                       "dependencies": {
                         "crc32-stream": {
-                          "version": "0.3.1"
+                          "version": "0.3.3",
+                          "from": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.3.tgz",
+                          "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.3.tgz"
                         }
                       }
                     }
@@ -4512,176 +9521,276 @@
               }
             },
             "async": {
-              "version": "0.9.0"
+              "version": "0.9.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
             },
             "q": {
-              "version": "1.0.1"
+              "version": "1.0.1",
+              "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
             },
             "request": {
-              "version": "2.45.0",
+              "version": "2.46.0",
+              "from": "https://registry.npmjs.org/request/-/request-2.46.0.tgz",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.46.0.tgz",
               "dependencies": {
                 "bl": {
-                  "version": "0.9.3",
+                  "version": "0.9.4",
+                  "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
                   "dependencies": {
                     "readable-stream": {
-                      "version": "1.0.32",
+                      "version": "1.0.33",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                       "dependencies": {
                         "core-util-is": {
-                          "version": "1.0.1"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
-                          "version": "0.0.1"
+                          "version": "0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
-                          "version": "0.10.31"
+                          "version": "0.10.31",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
-                          "version": "2.0.1"
+                          "version": "2.0.1",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
                     }
                   }
                 },
                 "caseless": {
-                  "version": "0.6.0"
+                  "version": "0.6.0",
+                  "from": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
                 },
                 "forever-agent": {
-                  "version": "0.5.2"
-                },
-                "qs": {
-                  "version": "1.2.2"
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.0"
-                },
-                "mime-types": {
-                  "version": "1.0.2"
-                },
-                "node-uuid": {
-                  "version": "1.4.1"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.0"
+                  "version": "0.5.2",
+                  "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
                 },
                 "form-data": {
                   "version": "0.1.4",
+                  "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
                   "dependencies": {
                     "combined-stream": {
-                      "version": "0.0.5",
+                      "version": "0.0.7",
+                      "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
                       "dependencies": {
                         "delayed-stream": {
-                          "version": "0.0.5"
+                          "version": "0.0.5",
+                          "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                         }
                       }
                     },
                     "mime": {
-                      "version": "1.2.11"
+                      "version": "1.2.11",
+                      "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+                      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                     }
                   }
                 },
+                "json-stringify-safe": {
+                  "version": "5.0.0",
+                  "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                },
+                "mime-types": {
+                  "version": "1.0.2",
+                  "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.4.3",
+                  "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                },
+                "qs": {
+                  "version": "1.2.2",
+                  "from": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.0",
+                  "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                },
                 "tough-cookie": {
                   "version": "0.12.1",
+                  "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
                   "dependencies": {
                     "punycode": {
-                      "version": "1.3.1"
+                      "version": "1.3.2",
+                      "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
                     }
                   }
                 },
                 "http-signature": {
-                  "version": "0.10.0",
+                  "version": "0.10.1",
+                  "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
                   "dependencies": {
                     "assert-plus": {
-                      "version": "0.1.2"
+                      "version": "0.1.5",
+                      "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
                     },
                     "asn1": {
-                      "version": "0.1.11"
+                      "version": "0.1.11",
+                      "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
                     },
                     "ctype": {
-                      "version": "0.5.2"
+                      "version": "0.5.3",
+                      "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
                     }
                   }
                 },
                 "oauth-sign": {
-                  "version": "0.4.0"
+                  "version": "0.4.0",
+                  "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
                 },
                 "hawk": {
                   "version": "1.1.1",
+                  "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
                   "dependencies": {
                     "hoek": {
-                      "version": "0.9.1"
+                      "version": "0.9.1",
+                      "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
                     },
                     "boom": {
-                      "version": "0.4.2"
+                      "version": "0.4.2",
+                      "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
                     },
                     "cryptiles": {
-                      "version": "0.2.2"
+                      "version": "0.2.2",
+                      "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
                     },
                     "sntp": {
-                      "version": "0.2.4"
+                      "version": "0.2.4",
+                      "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
                     }
                   }
                 },
                 "aws-sign2": {
-                  "version": "0.5.0"
+                  "version": "0.5.0",
+                  "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
                 },
                 "stringstream": {
-                  "version": "0.0.4"
+                  "version": "0.0.4",
+                  "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
                 }
               }
             },
             "underscore.string": {
-              "version": "2.3.3"
+              "version": "2.3.3",
+              "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
+              "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
             },
             "vargs": {
-              "version": "0.1.0"
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"
             }
           }
         },
         "sauce-connect-launcher": {
           "version": "0.6.1",
+          "from": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz",
+          "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz",
           "dependencies": {
             "async": {
-              "version": "0.9.0"
+              "version": "0.9.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
             },
             "adm-zip": {
-              "version": "0.4.4"
+              "version": "0.4.7",
+              "from": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
+              "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"
             },
             "rimraf": {
-              "version": "2.2.8"
+              "version": "2.2.8",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "q": {
-          "version": "0.9.7"
+          "version": "0.9.7",
+          "from": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
+          "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz"
         },
         "saucelabs": {
-          "version": "0.1.1"
+          "version": "0.1.1",
+          "from": "https://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"
         }
       }
     },
     "karma-script-launcher": {
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "from": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"
     },
     "load-grunt-tasks": {
       "version": "0.6.0",
+      "from": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-0.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-0.6.0.tgz",
       "dependencies": {
         "findup-sync": {
           "version": "0.1.3",
+          "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
           "dependencies": {
             "glob": {
               "version": "3.2.11",
+              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.5.0"
+                      "version": "2.5.0",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
-                      "version": "1.0.0"
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
                 }
@@ -4691,26 +9800,40 @@
         },
         "multimatch": {
           "version": "0.3.0",
+          "from": "https://registry.npmjs.org/multimatch/-/multimatch-0.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-0.3.0.tgz",
           "dependencies": {
             "array-differ": {
-              "version": "0.1.0"
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/array-differ/-/array-differ-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-0.1.0.tgz"
             },
             "array-union": {
               "version": "0.1.0",
+              "from": "https://registry.npmjs.org/array-union/-/array-union-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/array-union/-/array-union-0.1.0.tgz",
               "dependencies": {
                 "array-uniq": {
-                  "version": "0.1.1"
+                  "version": "0.1.1",
+                  "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-0.1.1.tgz"
                 }
               }
             },
             "minimatch": {
               "version": "0.3.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.5.0"
+                  "version": "2.5.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
-                  "version": "1.0.0"
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             }
@@ -4719,213 +9842,447 @@
       }
     },
     "lodash": {
-      "version": "2.4.1"
+      "version": "2.4.1",
+      "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
     },
     "marked": {
-      "version": "0.3.2"
+      "version": "0.3.3",
+      "from": "https://registry.npmjs.org/marked/-/marked-0.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.3.tgz"
     },
     "node-html-encoder": {
-      "version": "0.0.2"
+      "version": "0.0.2",
+      "from": "https://registry.npmjs.org/node-html-encoder/-/node-html-encoder-0.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/node-html-encoder/-/node-html-encoder-0.0.2.tgz"
     },
     "promises-aplus-tests": {
       "version": "2.1.0",
+      "from": "https://registry.npmjs.org/promises-aplus-tests/-/promises-aplus-tests-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/promises-aplus-tests/-/promises-aplus-tests-2.1.0.tgz",
       "dependencies": {
         "mocha": {
           "version": "1.21.5",
+          "from": "https://registry.npmjs.org/mocha/-/mocha-1.21.5.tgz",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.21.5.tgz",
           "dependencies": {
             "commander": {
-              "version": "2.3.0"
+              "version": "2.3.0",
+              "from": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz"
             },
             "debug": {
               "version": "2.0.0",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
               "dependencies": {
                 "ms": {
-                  "version": "0.6.2"
+                  "version": "0.6.2",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
                 }
               }
             },
             "diff": {
-              "version": "1.0.8"
+              "version": "1.0.8",
+              "from": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz",
+              "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"
             },
             "escape-string-regexp": {
-              "version": "1.0.2"
+              "version": "1.0.2",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
             },
             "glob": {
               "version": "3.2.3",
+              "from": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
               "dependencies": {
                 "minimatch": {
                   "version": "0.2.14",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.5.0"
+                      "version": "2.5.0",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
-                      "version": "1.0.0"
+                      "version": "1.0.0",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
                 },
                 "graceful-fs": {
-                  "version": "2.0.3"
+                  "version": "2.0.3",
+                  "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
                 },
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "growl": {
-              "version": "1.8.1"
+              "version": "1.8.1",
+              "from": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz",
+              "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz"
             },
             "jade": {
               "version": "0.26.3",
+              "from": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+              "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
               "dependencies": {
                 "commander": {
-                  "version": "0.6.1"
+                  "version": "0.6.1",
+                  "from": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+                  "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"
                 },
                 "mkdirp": {
-                  "version": "0.3.0"
+                  "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
                 }
               }
             },
             "mkdirp": {
               "version": "0.5.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
-                  "version": "0.0.8"
+                  "version": "0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             }
           }
         },
         "sinon": {
-          "version": "1.10.3",
+          "version": "1.14.1",
+          "from": "https://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz",
+          "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz",
           "dependencies": {
             "formatio": {
-              "version": "1.0.2",
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
               "dependencies": {
                 "samsam": {
-                  "version": "1.1.1"
+                  "version": "1.1.2",
+                  "from": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+                  "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"
                 }
               }
             },
             "util": {
               "version": "0.10.3",
+              "from": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+              "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
               "dependencies": {
                 "inherits": {
-                  "version": "2.0.1"
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
+            },
+            "lolex": {
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz"
             }
           }
         },
         "underscore": {
-          "version": "1.6.0"
+          "version": "1.6.0",
+          "from": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
         }
       }
     },
     "protractor": {
-      "version": "1.6.0",
+      "version": "2.1.0",
+      "from": "https://registry.npmjs.org/protractor/-/protractor-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-2.1.0.tgz",
       "dependencies": {
         "request": {
           "version": "2.36.0",
+          "from": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
           "dependencies": {
             "qs": {
-              "version": "0.6.6"
+              "version": "0.6.6",
+              "from": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
             },
             "json-stringify-safe": {
-              "version": "5.0.0"
+              "version": "5.0.1",
+              "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
             },
             "mime": {
-              "version": "1.2.11"
+              "version": "1.2.11",
+              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "forever-agent": {
-              "version": "0.5.2"
+              "version": "0.5.2",
+              "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
             },
             "node-uuid": {
-              "version": "1.4.2"
+              "version": "1.4.3",
+              "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
             },
             "tough-cookie": {
-              "version": "0.12.1",
-              "dependencies": {
-                "punycode": {
-                  "version": "1.3.2"
-                }
-              }
+              "version": "1.1.0",
+              "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
             },
             "form-data": {
               "version": "0.1.4",
+              "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
               "dependencies": {
                 "combined-stream": {
                   "version": "0.0.7",
+                  "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
                   "dependencies": {
                     "delayed-stream": {
-                      "version": "0.0.5"
+                      "version": "0.0.5",
+                      "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                     }
                   }
                 },
                 "async": {
-                  "version": "0.9.0"
+                  "version": "0.9.2",
+                  "from": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
                 }
               }
             },
             "tunnel-agent": {
-              "version": "0.4.0"
+              "version": "0.4.0",
+              "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
             },
             "http-signature": {
               "version": "0.10.1",
+              "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
               "dependencies": {
                 "assert-plus": {
-                  "version": "0.1.5"
+                  "version": "0.1.5",
+                  "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
                 },
                 "asn1": {
-                  "version": "0.1.11"
+                  "version": "0.1.11",
+                  "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
                 },
                 "ctype": {
-                  "version": "0.5.3"
+                  "version": "0.5.3",
+                  "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
                 }
               }
             },
             "oauth-sign": {
-              "version": "0.3.0"
+              "version": "0.3.0",
+              "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
             },
             "hawk": {
               "version": "1.0.0",
+              "from": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
               "dependencies": {
                 "hoek": {
-                  "version": "0.9.1"
+                  "version": "0.9.1",
+                  "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
                 },
                 "boom": {
-                  "version": "0.4.2"
+                  "version": "0.4.2",
+                  "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
                 },
                 "cryptiles": {
-                  "version": "0.2.2"
+                  "version": "0.2.2",
+                  "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
                 },
                 "sntp": {
-                  "version": "0.2.4"
+                  "version": "0.2.4",
+                  "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
                 }
               }
             },
             "aws-sign2": {
-              "version": "0.5.0"
+              "version": "0.5.0",
+              "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
             }
           }
         },
         "selenium-webdriver": {
-          "version": "2.44.0",
+          "version": "2.45.1",
+          "from": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.45.1.tgz",
+          "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.45.1.tgz",
           "dependencies": {
+            "rimraf": {
+              "version": "2.3.4",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "2.0.8",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
             "tmp": {
-              "version": "0.0.24"
+              "version": "0.0.24",
+              "from": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz",
+              "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz"
+            },
+            "ws": {
+              "version": "0.7.2",
+              "from": "https://registry.npmjs.org/ws/-/ws-0.7.2.tgz",
+              "resolved": "https://registry.npmjs.org/ws/-/ws-0.7.2.tgz",
+              "dependencies": {
+                "options": {
+                  "version": "0.0.6",
+                  "from": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
+                },
+                "ultron": {
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"
+                },
+                "bufferutil": {
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.1.0.tgz",
+                  "dependencies": {
+                    "bindings": {
+                      "version": "1.2.1",
+                      "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+                    },
+                    "nan": {
+                      "version": "1.8.4",
+                      "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
+                    }
+                  }
+                },
+                "utf-8-validate": {
+                  "version": "1.1.0",
+                  "from": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.1.0.tgz",
+                  "dependencies": {
+                    "bindings": {
+                      "version": "1.2.1",
+                      "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+                    },
+                    "nan": {
+                      "version": "1.8.4",
+                      "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
+                    }
+                  }
+                }
+              }
             },
             "xml2js": {
               "version": "0.4.4",
+              "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+              "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
               "dependencies": {
                 "sax": {
-                  "version": "0.6.1"
+                  "version": "0.6.1",
+                  "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
                 },
                 "xmlbuilder": {
-                  "version": "2.4.5",
+                  "version": "2.6.2",
+                  "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
+                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
                   "dependencies": {
-                    "lodash-node": {
-                      "version": "2.4.1"
+                    "lodash": {
+                      "version": "3.5.0",
+                      "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
                     }
                   }
                 }
@@ -4934,99 +10291,168 @@
           }
         },
         "minijasminenode": {
-          "version": "1.1.1"
+          "version": "1.1.1",
+          "from": "https://registry.npmjs.org/minijasminenode/-/minijasminenode-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/minijasminenode/-/minijasminenode-1.1.1.tgz"
         },
         "jasminewd": {
-          "version": "1.1.0"
+          "version": "1.1.0",
+          "from": "https://registry.npmjs.org/jasminewd/-/jasminewd-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/jasminewd/-/jasminewd-1.1.0.tgz"
         },
         "jasminewd2": {
-          "version": "0.0.2"
+          "version": "0.0.5",
+          "from": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-0.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-0.0.5.tgz"
         },
         "jasmine": {
-          "version": "2.1.1",
+          "version": "2.3.1",
+          "from": "https://registry.npmjs.org/jasmine/-/jasmine-2.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.3.1.tgz",
           "dependencies": {
+            "exit": {
+              "version": "0.1.2",
+              "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+            },
             "jasmine-core": {
-              "version": "2.1.3"
+              "version": "2.3.4",
+              "from": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.3.4.tgz",
+              "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.3.4.tgz"
             }
           }
         },
         "saucelabs": {
-          "version": "0.1.1"
+          "version": "0.1.1",
+          "from": "https://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"
         },
         "glob": {
           "version": "3.2.11",
+          "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
           "dependencies": {
             "inherits": {
-              "version": "2.0.1"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "minimatch": {
               "version": "0.3.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.5.0"
+                  "version": "2.6.4",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                 },
                 "sigmund": {
-                  "version": "1.0.0"
+                  "version": "1.0.1",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                 }
               }
             }
           }
         },
         "adm-zip": {
-          "version": "0.4.4"
+          "version": "0.4.4",
+          "from": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz",
+          "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz"
         },
         "optimist": {
           "version": "0.6.1",
+          "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "dependencies": {
             "wordwrap": {
-              "version": "0.0.2"
+              "version": "0.0.3",
+              "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
             },
             "minimist": {
-              "version": "0.0.10"
+              "version": "0.0.10",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
             }
           }
         },
         "q": {
-          "version": "1.0.0"
+          "version": "1.0.0",
+          "from": "https://registry.npmjs.org/q/-/q-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.0.0.tgz"
         },
         "source-map-support": {
-          "version": "0.2.9",
+          "version": "0.2.10",
+          "from": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.1.32",
+              "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
               "dependencies": {
                 "amdefine": {
-                  "version": "0.1.0"
+                  "version": "0.1.0",
+                  "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
                 }
               }
             }
           }
+        },
+        "html-entities": {
+          "version": "1.1.2",
+          "from": "https://registry.npmjs.org/html-entities/-/html-entities-1.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.1.2.tgz"
+        },
+        "accessibility-developer-tools": {
+          "version": "2.6.0",
+          "from": "https://registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.6.0.tgz",
+          "resolved": "https://registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.6.0.tgz"
         }
       }
     },
     "q": {
-      "version": "1.0.1"
+      "version": "1.0.1",
+      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "q-io": {
-      "version": "1.11.4",
+      "version": "1.12.0",
+      "from": "https://registry.npmjs.org/q-io/-/q-io-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/q-io/-/q-io-1.12.0.tgz",
       "dependencies": {
         "qs": {
-          "version": "1.2.2"
+          "version": "1.2.2",
+          "from": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"
         },
         "url2": {
-          "version": "0.0.0"
+          "version": "0.0.0",
+          "from": "https://registry.npmjs.org/url2/-/url2-0.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/url2/-/url2-0.0.0.tgz"
         },
         "mime": {
-          "version": "1.2.11"
+          "version": "1.3.4",
+          "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
         },
         "mimeparse": {
-          "version": "0.1.4"
+          "version": "0.1.4",
+          "from": "https://registry.npmjs.org/mimeparse/-/mimeparse-0.1.4.tgz",
+          "resolved": "https://registry.npmjs.org/mimeparse/-/mimeparse-0.1.4.tgz"
         },
         "collections": {
           "version": "0.2.2",
+          "from": "https://registry.npmjs.org/collections/-/collections-0.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/collections/-/collections-0.2.2.tgz",
           "dependencies": {
             "weak-map": {
-              "version": "1.0.0"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.0.tgz"
             }
           }
         }
@@ -5034,27 +10460,40 @@
     },
     "qq": {
       "version": "0.3.5",
+      "from": "https://registry.npmjs.org/qq/-/qq-0.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/qq/-/qq-0.3.5.tgz",
       "dependencies": {
         "q": {
-          "version": "0.8.4"
+          "version": "0.8.4",
+          "from": "https://registry.npmjs.org/q/-/q-0.8.4.tgz",
+          "resolved": "https://registry.npmjs.org/q/-/q-0.8.4.tgz"
         }
       }
     },
     "rewire": {
-      "version": "2.1.0"
+      "version": "2.1.5",
+      "from": "https://registry.npmjs.org/rewire/-/rewire-2.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/rewire/-/rewire-2.1.5.tgz"
     },
     "semver": {
-      "version": "4.0.3"
+      "version": "4.0.3",
+      "from": "https://registry.npmjs.org/semver/-/semver-4.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.0.3.tgz"
     },
     "shelljs": {
-      "version": "0.3.0"
+      "version": "0.3.0",
+      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
     },
     "sorted-object": {
-      "version": "1.0.0"
+      "version": "1.0.0",
+      "from": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"
     },
     "stringmap": {
-      "version": "0.2.2"
+      "version": "0.2.2",
+      "from": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz"
     }
-  },
-  "name": "angularjs"
+  }
 }
diff --git a/package.json b/package.json
index b0498c823ac8..2eaffa43e9d9 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,17 @@
 {
   "name": "angularjs",
+  "license": "MIT",
   "branchVersion": "^1.4.0-beta.0",
   "branchPattern": "1.4.*",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular.js.git"
   },
+  "engines": {
+    "node": "~0.10",
+    "npm": "~2.5"
+  },
+  "engineStrict": true,
   "devDependencies": {
     "angular-benchpress": "0.x.x",
     "benchmark": "1.x.x",
@@ -39,7 +45,7 @@
     "jasmine-node": "~1.14.5",
     "jasmine-reporters": "~1.0.1",
     "jshint-stylish": "~1.0.0",
-    "karma": "vojtajina/karma#socketio_10",
+    "karma": "0.12.32",
     "karma-browserstack-launcher": "0.1.2",
     "karma-chrome-launcher": "0.1.5",
     "karma-firefox-launcher": "0.1.3",
@@ -53,7 +59,7 @@
     "marked": "~0.3.0",
     "node-html-encoder": "0.0.2",
     "promises-aplus-tests": "~2.1.0",
-    "protractor": "^1.6.0",
+    "protractor": "^2.1.0",
     "q": "~1.0.0",
     "q-io": "^1.10.9",
     "qq": "^0.3.5",
diff --git a/scripts/bower/publish.sh b/scripts/bower/publish.sh
index 0170f6183174..5189206f4384 100755
--- a/scripts/bower/publish.sh
+++ b/scripts/bower/publish.sh
@@ -14,21 +14,6 @@ function init {
   TMP_DIR=$(resolveDir ../../tmp)
   BUILD_DIR=$(resolveDir ../../build)
   NEW_VERSION=$(cat $BUILD_DIR/version.txt)
-  REPOS=(
-    angular
-    angular-animate
-    angular-aria
-    angular-cookies
-    angular-i18n
-    angular-loader
-    angular-mocks
-    angular-route
-    angular-resource
-    angular-sanitize
-    angular-scenario
-    angular-touch
-    angular-messages
-  )
 }
 
 
@@ -63,6 +48,21 @@ function prepare {
   cp $BUILD_DIR/angular-csp.css $TMP_DIR/bower-angular
 
 
+  #
+  # Run local precommit script if there is one
+  #
+  for repo in "${REPOS[@]}"
+  do
+    if [ -f $TMP_DIR/bower-$repo/precommit.sh ]
+      then
+        echo "-- Running precommit.sh script for bower-$repo"
+        cd $TMP_DIR/bower-$repo
+        $TMP_DIR/bower-$repo/precommit.sh
+        cd $SCRIPT_DIR
+    fi
+  done
+
+
   #
   # update bower.json
   # tag each repo
@@ -114,4 +114,5 @@ function publish {
   done
 }
 
+source $(dirname $0)/repos.inc
 source $(dirname $0)/../utils.inc
diff --git a/scripts/bower/repos.inc b/scripts/bower/repos.inc
new file mode 100644
index 000000000000..b2b1421be1b4
--- /dev/null
+++ b/scripts/bower/repos.inc
@@ -0,0 +1,19 @@
+#!/bin/false
+# -*- mode: sh; -*- vim: set filetype=sh:
+
+REPOS=(
+  angular
+  angular-animate
+  angular-aria
+  angular-cookies
+  angular-i18n
+  angular-loader
+  angular-message-format
+  angular-messages
+  angular-mocks
+  angular-resource
+  angular-route
+  angular-sanitize
+  angular-scenario
+  angular-touch
+)
diff --git a/scripts/bower/unpublish.sh b/scripts/bower/unpublish.sh
index 683ac1cbd3be..f05a5d1699a2 100755
--- a/scripts/bower/unpublish.sh
+++ b/scripts/bower/unpublish.sh
@@ -13,21 +13,6 @@ ARG_DEFS=(
 
 function init {
   TMP_DIR=$(resolveDir ../../tmp)
-  REPOS=(
-    angular
-    angular-animate
-    angular-aria
-    angular-cookies
-    angular-i18n
-    angular-loader
-    angular-messages
-    angular-mocks
-    angular-route
-    angular-resource
-    angular-sanitize
-    angular-scenario
-    angular-touch
-  )
 }
 
 function prepare {
@@ -53,4 +38,5 @@ function publish {
   done
 }
 
+source $(dirname $0)/repos.inc
 source $(dirname $0)/../utils.inc
diff --git a/scripts/code.angularjs.org/publish.sh b/scripts/code.angularjs.org/publish.sh
index 7fca3cad1374..fa2c22b440d8 100755
--- a/scripts/code.angularjs.org/publish.sh
+++ b/scripts/code.angularjs.org/publish.sh
@@ -23,22 +23,26 @@ function init {
 }
 
 function prepare {
-  if [[  $IS_SNAPSHOT_BUILD ]]; then
-    # nothing to prepare for snapshot builds as
-    # code.angularjs.org will fetch the current snapshot from
-    # the build server during publish
-    exit 0
-  fi
 
   echo "-- Cloning code.angularjs.org"
-  git clone git@github.com:angular/code.angularjs.org.git $REPO_DIR
+  git clone git@github.com:angular/code.angularjs.org.git $REPO_DIR --depth=1
 
-  #
-  # copy the files from the build
-  #
   echo "-- Updating code.angularjs.org"
-  mkdir $REPO_DIR/$NEW_VERSION
-  cp -r $BUILD_DIR/* $REPO_DIR/$NEW_VERSION/
+
+  if [[  $IS_SNAPSHOT_BUILD ]]; then
+    #
+    # update the snapshot folder
+    #
+    rm -rf $REPO_DIR/snapshot
+    mkdir $REPO_DIR/snapshot
+    cp -r $BUILD_DIR/* $REPO_DIR/snapshot/
+  else
+    #
+    # copy the files from the build
+    #
+    mkdir $REPO_DIR/$NEW_VERSION
+    cp -r $BUILD_DIR/* $REPO_DIR/$NEW_VERSION/
+  fi
 
   #
   # commit
@@ -50,13 +54,6 @@ function prepare {
 }
 
 
-function _update_snapshot() {
-  for backend in "$@" ; do
-    echo "-- Updating snapshot version: backend=$backend"
-    curl -G --data-urlencode "ver=$NEW_VERSION" http://$backend:8003/fetchLatestSnapshot.php
-  done
-}
-
 function _update_code() {
   cd $REPO_DIR
 
@@ -74,12 +71,7 @@ function publish {
   # the currently serving Compute Engine backends.
   # code.angularjs.org is served out of port 8003 on these backends.
   backends=("$(dig backends.angularjs.org +short TXT | python -c 'print raw_input()[1:-1].replace(",", "\n")')")
-
-  if [[  $IS_SNAPSHOT_BUILD ]]; then
-    _update_snapshot ${backends[@]}
-  else
-    _update_code ${backends[@]}
-  fi
+  _update_code ${backends[@]}
 }
 
 source $(dirname $0)/../utils.inc
diff --git a/scripts/clean-shrinkwrap.js b/scripts/npm/clean-shrinkwrap.js
similarity index 55%
rename from scripts/clean-shrinkwrap.js
rename to scripts/npm/clean-shrinkwrap.js
index c46fe295da6b..953b126031f2 100755
--- a/scripts/clean-shrinkwrap.js
+++ b/scripts/npm/clean-shrinkwrap.js
@@ -10,22 +10,17 @@
 var _ = require('lodash');
 var sorted = require('sorted-object');
 var fs = require('fs');
+var path = require('path');
 
 
 function cleanModule(module, name) {
 
-  // keep `from` and `resolve` properties for git dependencies, delete otherwise
-  if (!(module.resolved && module.resolved.match(/^git:\/\//))) {
-    delete module.from;
+  // keep `resolve` properties for git dependencies, delete otherwise
+  delete module.from;
+  if (!(module.resolved && module.resolved.match(/^git(\+[a-z]+)?:\/\//))) {
     delete module.resolved;
   }
 
-  if (name === 'chokidar') {
-    if (module.version === '0.8.1') {
-      delete module.dependencies;
-    }
-  }
-
   _.forEach(module.dependencies, function(mod, name) {
     cleanModule(mod, name);
   });
@@ -33,10 +28,11 @@ function cleanModule(module, name) {
 
 
 console.log('Reading npm-shrinkwrap.json');
-var shrinkwrap = require('./../npm-shrinkwrap.json');
+var shrinkwrap = require('../../npm-shrinkwrap.json');
 
 console.log('Cleaning shrinkwrap object');
 cleanModule(shrinkwrap, shrinkwrap.name);
 
-console.log('Writing cleaned npm-shrinkwrap.json');
-fs.writeFileSync('./npm-shrinkwrap.json', JSON.stringify(sorted(shrinkwrap), null, 2) + "\n");
+var cleanShrinkwrapPath = path.join(__dirname, '..', '..', 'npm-shrinkwrap.clean.json');
+console.log('Writing cleaned to', cleanShrinkwrapPath);
+fs.writeFileSync(cleanShrinkwrapPath, JSON.stringify(sorted(shrinkwrap), null, 2) + "\n");
diff --git a/scripts/npm/install-dependencies.sh b/scripts/npm/install-dependencies.sh
new file mode 100755
index 000000000000..1851d4ea6ae4
--- /dev/null
+++ b/scripts/npm/install-dependencies.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+SHRINKWRAP_FILE=npm-shrinkwrap.json
+SHRINKWRAP_CACHED_FILE=node_modules/npm-shrinkwrap.cached.json
+
+if diff -q $SHRINKWRAP_FILE $SHRINKWRAP_CACHED_FILE; then
+  echo 'No shrinkwrap changes detected. npm install will be skipped...';
+else
+  echo 'Blowing away node_modules and reinstalling npm dependencies...'
+  rm -rf node_modules
+  npm install
+  cp $SHRINKWRAP_FILE $SHRINKWRAP_CACHED_FILE
+  echo 'npm install successful!'
+fi
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
index baeda7baf015..9e4f4fcd180a 100755
--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -7,9 +7,9 @@ export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
 
 if [ $JOB = "unit" ]; then
   if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
-    BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11"
+    BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_iOS"
   else
-    BROWSERS="SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11"
+    BROWSERS="SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS"
   fi
 
   grunt test:promises-aplus
diff --git a/scripts/travis/wait_for_browser_provider.sh b/scripts/travis/wait_for_browser_provider.sh
index 1e8157c2b03a..39332258c4b6 100755
--- a/scripts/travis/wait_for_browser_provider.sh
+++ b/scripts/travis/wait_for_browser_provider.sh
@@ -2,6 +2,18 @@
 
 
 # Wait for Connect to be ready before exiting
+# Time out if we wait for more than 2 minutes, so that we can print logs.
+let "counter=0"
+
 while [ ! -f $BROWSER_PROVIDER_READY_FILE ]; do
+  let "counter++"
+  if [ $counter -gt 240 ]; then
+    echo "Timed out after 2 minutes waiting for browser provider ready file"
+    # We must manually print logs here because travis will not run
+    # after_script commands if the failure occurs before the script
+    # phase.
+    ./scripts/travis/print_logs.sh
+    exit 5
+  fi
   sleep .5
 done
diff --git a/src/.jshintrc b/src/.jshintrc
index d0561483c9ad..e5ce17e43234 100644
--- a/src/.jshintrc
+++ b/src/.jshintrc
@@ -35,6 +35,7 @@
     "extend": false,
     "toInt": false,
     "inherit": false,
+    "merge": false,
     "noop": false,
     "identity": false,
     "valueFn": false,
@@ -54,6 +55,7 @@
     "isBlob": false,
     "isBoolean": false,
     "isPromiseLike": false,
+    "hasCustomToString": false,
     "trim": false,
     "escapeForRegexp": false,
     "isElement": false,
@@ -70,6 +72,8 @@
     "toJsonReplacer": false,
     "toJson": false,
     "fromJson": false,
+    "convertTimezoneToLocal": false,
+    "timezoneToOffset": false,
     "startingTag": false,
     "tryDecodeURIComponent": false,
     "parseKeyValue": false,
@@ -93,6 +97,7 @@
     "skipDestroyOnNextJQueryCleanData": true,
 
     "NODE_TYPE_ELEMENT": false,
+    "NODE_TYPE_ATTRIBUTE": false,
     "NODE_TYPE_TEXT": false,
     "NODE_TYPE_COMMENT": false,
     "NODE_TYPE_COMMENT": false,
@@ -158,9 +163,6 @@
     /* ng/compile.js */
     "directiveNormalize": false,
 
-    /* ng/parse.js */
-    "setter": false,
-
     /* ng/directive/directives.js */
     "ngDirective": false,
 
diff --git a/src/Angular.js b/src/Angular.js
index 0a64cd016273..485a53a25d7f 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -29,12 +29,14 @@
   extend: true,
   toInt: true,
   inherit: true,
+  merge: true,
   noop: true,
   identity: true,
   valueFn: true,
   isUndefined: true,
   isDefined: true,
   isObject: true,
+  isBlankObject: true,
   isString: true,
   isNumber: true,
   isDate: true,
@@ -65,6 +67,8 @@
   toJsonReplacer: true,
   toJson: true,
   fromJson: true,
+  convertTimezoneToLocal: true,
+  timezoneToOffset: true,
   startingTag: true,
   tryDecodeURIComponent: true,
   parseKeyValue: true,
@@ -85,6 +89,7 @@
   createMap: true,
 
   NODE_TYPE_ELEMENT: true,
+  NODE_TYPE_ATTRIBUTE: true,
   NODE_TYPE_TEXT: true,
   NODE_TYPE_COMMENT: true,
   NODE_TYPE_DOCUMENT: true,
@@ -171,6 +176,7 @@ var
     splice            = [].splice,
     push              = [].push,
     toString          = Object.prototype.toString,
+    getPrototypeOf    = Object.getPrototypeOf,
     ngMinErr          = minErr('ng'),
 
     /** @name angular */
@@ -196,7 +202,9 @@ function isArrayLike(obj) {
     return false;
   }
 
-  var length = obj.length;
+  // Support: iOS 8.2 (not reproducible in simulator)
+  // "length" in obj used to prevent JIT error (gh-11508)
+  var length = "length" in Object(obj) && obj.length;
 
   if (obj.nodeType === NODE_TYPE_ELEMENT && length) {
     return true;
@@ -261,12 +269,25 @@ function forEach(obj, iterator, context) {
       }
     } else if (obj.forEach && obj.forEach !== forEach) {
         obj.forEach(iterator, context, obj);
-    } else {
+    } else if (isBlankObject(obj)) {
+      // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+      for (key in obj) {
+        iterator.call(context, obj[key], key, obj);
+      }
+    } else if (typeof obj.hasOwnProperty === 'function') {
+      // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed
       for (key in obj) {
         if (obj.hasOwnProperty(key)) {
           iterator.call(context, obj[key], key, obj);
         }
       }
+    } else {
+      // Slow path for objects which do not have a method `hasOwnProperty`
+      for (key in obj) {
+        if (hasOwnProperty.call(obj, key)) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
     }
   }
   return obj;
@@ -318,6 +339,37 @@ function setHashKey(obj, h) {
   }
 }
 
+
+function baseExtend(dst, objs, deep) {
+  var h = dst.$$hashKey;
+
+  for (var i = 0, ii = objs.length; i < ii; ++i) {
+    var obj = objs[i];
+    if (!isObject(obj) && !isFunction(obj)) continue;
+    var keys = Object.keys(obj);
+    for (var j = 0, jj = keys.length; j < jj; j++) {
+      var key = keys[j];
+      var src = obj[key];
+
+      if (deep && isObject(src)) {
+        if (isDate(src)) {
+          dst[key] = new Date(src.valueOf());
+        } else if (isRegExp(src)) {
+          dst[key] = new RegExp(src);
+        } else {
+          if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
+          baseExtend(dst[key], [src], true);
+        }
+      } else {
+        dst[key] = src;
+      }
+    }
+  }
+
+  setHashKey(dst, h);
+  return dst;
+}
+
 /**
  * @ngdoc function
  * @name angular.extend
@@ -328,30 +380,43 @@ function setHashKey(obj, h) {
  * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
  * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
  * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`.
- * Note: Keep in mind that `angular.extend` does not support recursive merge (deep copy).
+ *
+ * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use
+ * {@link angular.merge} for this.
  *
  * @param {Object} dst Destination object.
  * @param {...Object} src Source object(s).
  * @returns {Object} Reference to `dst`.
  */
 function extend(dst) {
-  var h = dst.$$hashKey;
+  return baseExtend(dst, slice.call(arguments, 1), false);
+}
 
-  for (var i = 1, ii = arguments.length; i < ii; i++) {
-    var obj = arguments[i];
-    if (obj) {
-      var keys = Object.keys(obj);
-      for (var j = 0, jj = keys.length; j < jj; j++) {
-        var key = keys[j];
-        dst[key] = obj[key];
-      }
-    }
-  }
 
-  setHashKey(dst, h);
-  return dst;
+/**
+* @ngdoc function
+* @name angular.merge
+* @module ng
+* @kind function
+*
+* @description
+* Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+* to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+* by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`.
+*
+* Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
+* objects, performing a deep copy.
+*
+* @param {Object} dst Destination object.
+* @param {...Object} src Source object(s).
+* @returns {Object} Reference to `dst`.
+*/
+function merge(dst) {
+  return baseExtend(dst, slice.call(arguments, 1), true);
 }
 
+
+
 function toInt(str) {
   return parseInt(str, 10);
 }
@@ -405,6 +470,11 @@ identity.$inject = [];
 
 function valueFn(value) {return function() {return value;};}
 
+function hasCustomToString(obj) {
+  return isFunction(obj.toString) && obj.toString !== Object.prototype.toString;
+}
+
+
 /**
  * @ngdoc function
  * @name angular.isUndefined
@@ -454,6 +524,16 @@ function isObject(value) {
 }
 
 
+/**
+ * Determine if a value is an object with a null prototype
+ *
+ * @returns {boolean} True if `value` is an `Object` with a null prototype
+ */
+function isBlankObject(value) {
+  return value !== null && typeof value === 'object' && !getPrototypeOf(value);
+}
+
+
 /**
  * @ngdoc function
  * @name angular.isString
@@ -478,6 +558,12 @@ function isString(value) {return typeof value === 'string';}
  * @description
  * Determines if a reference is a `Number`.
  *
+ * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`.
+ *
+ * If you wish to exclude these then you can use the native
+ * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite)
+ * method.
+ *
  * @param {*} value Reference to check.
  * @returns {boolean} True if `value` is a `Number`.
  */
@@ -720,9 +806,18 @@ function copy(source, destination, stackSource, stackDest) {
 
   if (!destination) {
     destination = source;
-    if (source) {
+    if (isObject(source)) {
+      var index;
+      if (stackSource && (index = stackSource.indexOf(source)) !== -1) {
+        return stackDest[index];
+      }
+
+      // TypedArray, Date and RegExp have specific copy functionality and must be
+      // pushed onto the stack before returning.
+      // Array and other objects create the base object and recurse to copy child
+      // objects. The array/object will be pushed onto the stack when recursed.
       if (isArray(source)) {
-        destination = copy(source, [], stackSource, stackDest);
+        return copy(source, [], stackSource, stackDest);
       } else if (isTypedArray(source)) {
         destination = new source.constructor(source);
       } else if (isDate(source)) {
@@ -730,9 +825,14 @@ function copy(source, destination, stackSource, stackDest) {
       } else if (isRegExp(source)) {
         destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]);
         destination.lastIndex = source.lastIndex;
-      } else if (isObject(source)) {
-        var emptyObject = Object.create(Object.getPrototypeOf(source));
-        destination = copy(source, emptyObject, stackSource, stackDest);
+      } else {
+        var emptyObject = Object.create(getPrototypeOf(source));
+        return copy(source, emptyObject, stackSource, stackDest);
+      }
+
+      if (stackDest) {
+        stackSource.push(source);
+        stackDest.push(destination);
       }
     }
   } else {
@@ -743,23 +843,15 @@ function copy(source, destination, stackSource, stackDest) {
     stackDest = stackDest || [];
 
     if (isObject(source)) {
-      var index = stackSource.indexOf(source);
-      if (index !== -1) return stackDest[index];
-
       stackSource.push(source);
       stackDest.push(destination);
     }
 
-    var result;
+    var result, key;
     if (isArray(source)) {
       destination.length = 0;
       for (var i = 0; i < source.length; i++) {
-        result = copy(source[i], null, stackSource, stackDest);
-        if (isObject(source[i])) {
-          stackSource.push(source[i]);
-          stackDest.push(result);
-        }
-        destination.push(result);
+        destination.push(copy(source[i], null, stackSource, stackDest));
       }
     } else {
       var h = destination.$$hashKey;
@@ -770,19 +862,28 @@ function copy(source, destination, stackSource, stackDest) {
           delete destination[key];
         });
       }
-      for (var key in source) {
-        if (source.hasOwnProperty(key)) {
-          result = copy(source[key], null, stackSource, stackDest);
-          if (isObject(source[key])) {
-            stackSource.push(source[key]);
-            stackDest.push(result);
+      if (isBlankObject(source)) {
+        // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+        for (key in source) {
+          destination[key] = copy(source[key], null, stackSource, stackDest);
+        }
+      } else if (source && typeof source.hasOwnProperty === 'function') {
+        // Slow path, which must rely on hasOwnProperty
+        for (key in source) {
+          if (source.hasOwnProperty(key)) {
+            destination[key] = copy(source[key], null, stackSource, stackDest);
+          }
+        }
+      } else {
+        // Slowest path --- hasOwnProperty can't be called as a method
+        for (key in source) {
+          if (hasOwnProperty.call(source, key)) {
+            destination[key] = copy(source[key], null, stackSource, stackDest);
           }
-          destination[key] = result;
         }
       }
       setHashKey(destination,h);
     }
-
   }
   return destination;
 }
@@ -860,18 +961,19 @@ function equals(o1, o2) {
       } else if (isDate(o1)) {
         if (!isDate(o2)) return false;
         return equals(o1.getTime(), o2.getTime());
-      } else if (isRegExp(o1) && isRegExp(o2)) {
-        return o1.toString() == o2.toString();
+      } else if (isRegExp(o1)) {
+        return isRegExp(o2) ? o1.toString() == o2.toString() : false;
       } else {
-        if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || isArray(o2)) return false;
-        keySet = {};
+        if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
+          isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
+        keySet = createMap();
         for (key in o1) {
           if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
           if (!equals(o1[key], o2[key])) return false;
           keySet[key] = true;
         }
         for (key in o2) {
-          if (!keySet.hasOwnProperty(key) &&
+          if (!(key in keySet) &&
               key.charAt(0) !== '$' &&
               o2[key] !== undefined &&
               !isFunction(o2[key])) return false;
@@ -884,22 +986,39 @@ function equals(o1, o2) {
 }
 
 var csp = function() {
-  if (isDefined(csp.isActive_)) return csp.isActive_;
+  if (!isDefined(csp.rules)) {
+
 
-  var active = !!(document.querySelector('[ng-csp]') ||
-                  document.querySelector('[data-ng-csp]'));
+    var ngCspElement = (document.querySelector('[ng-csp]') ||
+                    document.querySelector('[data-ng-csp]'));
 
-  if (!active) {
+    if (ngCspElement) {
+      var ngCspAttribute = ngCspElement.getAttribute('ng-csp') ||
+                    ngCspElement.getAttribute('data-ng-csp');
+      csp.rules = {
+        noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1),
+        noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1)
+      };
+    } else {
+      csp.rules = {
+        noUnsafeEval: noUnsafeEval(),
+        noInlineStyle: false
+      };
+    }
+  }
+
+  return csp.rules;
+
+  function noUnsafeEval() {
     try {
       /* jshint -W031, -W054 */
       new Function('');
       /* jshint +W031, +W054 */
+      return false;
     } catch (e) {
-      active = true;
+      return true;
     }
   }
-
-  return (csp.isActive_ = active);
 };
 
 /**
@@ -908,17 +1027,17 @@ var csp = function() {
  * @name ngJq
  *
  * @element ANY
- * @param {string=} the name of the library available under `window`
+ * @param {string=} ngJq the name of the library available under `window`
  * to be used for angular.element
  * @description
  * Use this directive to force the angular.element library.  This should be
  * used to force either jqLite by leaving ng-jq blank or setting the name of
  * the jquery variable under window (eg. jQuery).
  *
- * Since this directive is global for the angular library, it is recommended
- * that it's added to the same element as ng-app or the HTML element, but it is not mandatory.
- * It needs to be noted that only the first instance of `ng-jq` will be used and all others
- * ignored.
+ * Since angular looks for this directive when it is loaded (doesn't wait for the
+ * DOMContentLoaded event), it must be placed on an element that comes before the script
+ * which loads angular. Also, only the first instance of `ng-jq` will be used and all
+ * others ignored.
  *
  * @example
  * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
@@ -943,18 +1062,15 @@ var csp = function() {
 var jq = function() {
   if (isDefined(jq.name_)) return jq.name_;
   var el;
-  var i, ii = ngAttrPrefixes.length;
+  var i, ii = ngAttrPrefixes.length, prefix, name;
   for (i = 0; i < ii; ++i) {
-    if (el = document.querySelector('[' + ngAttrPrefixes[i].replace(':', '\\:') + 'jq]')) {
+    prefix = ngAttrPrefixes[i];
+    if (el = document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) {
+      name = el.getAttribute(prefix + 'jq');
       break;
     }
   }
 
-  var name;
-  if (el) {
-    name = getNgAttribute(el, "jq");
-  }
-
   return (jq.name_ = name);
 };
 
@@ -1035,8 +1151,8 @@ function toJsonReplacer(key, value) {
  * stripped since angular uses this notation internally.
  *
  * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON.
- * @param {boolean|number=} pretty If set to true, the JSON output will contain newlines and whitespace.
- *    If set to an integer, the JSON output will contain that many spaces per indentation (the default is 2).
+ * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace.
+ *    If set to an integer, the JSON output will contain that many spaces per indentation.
  * @returns {string|undefined} JSON-ified string representing `obj`.
  */
 function toJson(obj, pretty) {
@@ -1067,6 +1183,26 @@ function fromJson(json) {
 }
 
 
+function timezoneToOffset(timezone, fallback) {
+  var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+  return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
+}
+
+
+function addDateMinutes(date, minutes) {
+  date = new Date(date.getTime());
+  date.setMinutes(date.getMinutes() + minutes);
+  return date;
+}
+
+
+function convertTimezoneToLocal(date, timezone, reverse) {
+  reverse = reverse ? -1 : 1;
+  var timezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
+  return addDateMinutes(date, reverse * (timezoneOffset - date.getTimezoneOffset()));
+}
+
+
 /**
  * @returns {string} Returns the string representation of the element.
  */
@@ -1114,13 +1250,19 @@ function tryDecodeURIComponent(value) {
  * @returns {Object.<string,boolean|Array>}
  */
 function parseKeyValue(/**string*/keyValue) {
-  var obj = {}, key_value, key;
+  var obj = {};
   forEach((keyValue || "").split('&'), function(keyValue) {
+    var splitPoint, key, val;
     if (keyValue) {
-      key_value = keyValue.replace(/\+/g,'%20').split('=');
-      key = tryDecodeURIComponent(key_value[0]);
+      key = keyValue = keyValue.replace(/\+/g,'%20');
+      splitPoint = keyValue.indexOf('=');
+      if (splitPoint !== -1) {
+        key = keyValue.substring(0, splitPoint);
+        val = keyValue.substring(splitPoint + 1);
+      }
+      key = tryDecodeURIComponent(key);
       if (isDefined(key)) {
-        var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;
+        val = isDefined(val) ? tryDecodeURIComponent(val) : true;
         if (!hasOwnProperty.call(obj, key)) {
           obj[key] = val;
         } else if (isArray(obj[key])) {
@@ -1195,10 +1337,9 @@ var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-'];
 
 function getNgAttribute(element, ngAttr) {
   var attr, i, ii = ngAttrPrefixes.length;
-  element = jqLite(element);
   for (i = 0; i < ii; ++i) {
     attr = ngAttrPrefixes[i] + ngAttr;
-    if (isString(attr = element.attr(attr))) {
+    if (isString(attr = element.getAttribute(attr))) {
       return attr;
     }
   }
@@ -1673,6 +1814,7 @@ function createMap() {
 }
 
 var NODE_TYPE_ELEMENT = 1;
+var NODE_TYPE_ATTRIBUTE = 2;
 var NODE_TYPE_TEXT = 3;
 var NODE_TYPE_COMMENT = 8;
 var NODE_TYPE_DOCUMENT = 9;
diff --git a/src/AngularPublic.js b/src/AngularPublic.js
index b81257b9fff7..78901de03cda 100644
--- a/src/AngularPublic.js
+++ b/src/AngularPublic.js
@@ -3,7 +3,6 @@
 /* global angularModule: true,
   version: true,
 
-  $LocaleProvider,
   $CompileProvider,
 
   htmlAnchorDirective,
@@ -20,7 +19,6 @@
   ngClassDirective,
   ngClassEvenDirective,
   ngClassOddDirective,
-  ngCspDirective,
   ngCloakDirective,
   ngControllerDirective,
   ngFormDirective,
@@ -57,15 +55,21 @@
 
   $AnchorScrollProvider,
   $AnimateProvider,
+  $$CoreAnimateQueueProvider,
+  $$CoreAnimateRunnerProvider,
   $BrowserProvider,
   $CacheFactoryProvider,
   $ControllerProvider,
   $DocumentProvider,
   $ExceptionHandlerProvider,
   $FilterProvider,
+  $$ForceReflowProvider,
   $InterpolateProvider,
   $IntervalProvider,
+  $$HashMapProvider,
   $HttpProvider,
+  $HttpParamSerializerProvider,
+  $HttpParamSerializerJQLikeProvider,
   $HttpBackendProvider,
   $LocationProvider,
   $LogProvider,
@@ -82,9 +86,9 @@
   $$TestabilityProvider,
   $TimeoutProvider,
   $$RAFProvider,
-  $$AsyncCallbackProvider,
   $WindowProvider,
-  $$jqLiteProvider
+  $$jqLiteProvider,
+  $$CookieReaderProvider
 */
 
 
@@ -116,6 +120,7 @@ function publishExternalAPI(angular) {
     'bootstrap': bootstrap,
     'copy': copy,
     'extend': extend,
+    'merge': merge,
     'equals': equals,
     'element': jqLite,
     'forEach': forEach,
@@ -145,11 +150,6 @@ function publishExternalAPI(angular) {
   });
 
   angularModule = setupModuleLoader(window);
-  try {
-    angularModule('ngLocale');
-  } catch (e) {
-    angularModule('ngLocale', []).provider('$locale', $LocaleProvider);
-  }
 
   angularModule('ng', ['ngLocale'], ['$provide',
     function ngModule($provide) {
@@ -212,15 +212,20 @@ function publishExternalAPI(angular) {
       $provide.provider({
         $anchorScroll: $AnchorScrollProvider,
         $animate: $AnimateProvider,
+        $$animateQueue: $$CoreAnimateQueueProvider,
+        $$AnimateRunner: $$CoreAnimateRunnerProvider,
         $browser: $BrowserProvider,
         $cacheFactory: $CacheFactoryProvider,
         $controller: $ControllerProvider,
         $document: $DocumentProvider,
         $exceptionHandler: $ExceptionHandlerProvider,
         $filter: $FilterProvider,
+        $$forceReflow: $$ForceReflowProvider,
         $interpolate: $InterpolateProvider,
         $interval: $IntervalProvider,
         $http: $HttpProvider,
+        $httpParamSerializer: $HttpParamSerializerProvider,
+        $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
         $httpBackend: $HttpBackendProvider,
         $location: $LocationProvider,
         $log: $LogProvider,
@@ -237,8 +242,9 @@ function publishExternalAPI(angular) {
         $timeout: $TimeoutProvider,
         $window: $WindowProvider,
         $$rAF: $$RAFProvider,
-        $$asyncCallback: $$AsyncCallbackProvider,
-        $$jqLite: $$jqLiteProvider
+        $$jqLite: $$jqLiteProvider,
+        $$HashMap: $$HashMapProvider,
+        $$cookieReader: $$CookieReaderProvider
       });
     }
   ]);
diff --git a/src/angular.bind b/src/angular.bind
new file mode 100644
index 000000000000..01fa0605799f
--- /dev/null
+++ b/src/angular.bind
@@ -0,0 +1,9 @@
+if (window.angular.bootstrap) {
+  //AngularJS is already loaded, so we can return here...
+  console.log('WARNING: Tried to load angular more than once.');
+  return;
+}
+
+//try to bind to jquery now so that one can write jqLite(document).ready()
+//but we will rebind on bootstrap again.
+bindJQuery();
diff --git a/src/angular.suffix b/src/angular.suffix
index 4baa20e1b0b6..a79a3fb67841 100644
--- a/src/angular.suffix
+++ b/src/angular.suffix
@@ -1,15 +1,3 @@
-  if (window.angular.bootstrap) {
-    //AngularJS is already loaded, so we can return here...
-    console.log('WARNING: Tried to load angular more than once.');
-    return;
-  }
-
-  //try to bind to jquery now so that one can write jqLite(document).ready()
-  //but we will rebind on bootstrap again.
-  bindJQuery();
-
-  publishExternalAPI(angular);
-
   jqLite(document).ready(function() {
     angularInit(document, bootstrap);
   });
diff --git a/src/apis.js b/src/apis.js
index 36e0a103ff82..0549730be604 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -73,3 +73,9 @@ HashMap.prototype = {
     return value;
   }
 };
+
+var $$HashMapProvider = [function() {
+  this.$get = [function() {
+    return HashMap;
+  }];
+}];
diff --git a/src/auto/injector.js b/src/auto/injector.js
index fb1dc3960a26..303348f5ee67 100644
--- a/src/auto/injector.js
+++ b/src/auto/injector.js
@@ -179,7 +179,7 @@ function annotate(fn, strictDi, name) {
  * Return an instance of the service.
  *
  * @param {string} name The name of the instance to retrieve.
- * @param {string} caller An optional string to provide the origin of the function call for error messages.
+ * @param {string=} caller An optional string to provide the origin of the function call for error messages.
  * @return {*} The instance.
  */
 
@@ -190,8 +190,8 @@ function annotate(fn, strictDi, name) {
  * @description
  * Invoke the method and supply the method arguments from the `$injector`.
  *
- * @param {!Function} fn The function to invoke. Function parameters are injected according to the
- *   {@link guide/di $inject Annotation} rules.
+ * @param {Function|Array.<string|Function>} fn The injectable function to invoke. Function parameters are
+ *   injected according to the {@link guide/di $inject Annotation} rules.
  * @param {Object=} self The `this` for the invoked method.
  * @param {Object=} locals Optional object. If preset then any argument names are read from this
  *                         object first, before the `$injector` is consulted.
@@ -458,8 +458,8 @@ function annotate(fn, strictDi, name) {
  * configure your service in a provider.
  *
  * @param {string} name The name of the instance.
- * @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand
- *                            for `$provide.provider(name, {$get: $getFn})`.
+ * @param {Function|Array.<string|Function>} $getFn The injectable $getFn for the instance creation.
+ *                      Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`.
  * @returns {Object} registered provider instance
  *
  * @example
@@ -494,7 +494,8 @@ function annotate(fn, strictDi, name) {
  * as a type/class.
  *
  * @param {string} name The name of the instance.
- * @param {Function} constructor A class (constructor function) that will be instantiated.
+ * @param {Function|Array.<string|Function>} constructor An injectable class (constructor function)
+ *     that will be instantiated.
  * @returns {Object} registered provider instance
  *
  * @example
@@ -593,7 +594,7 @@ function annotate(fn, strictDi, name) {
  * object which replaces or wraps and delegates to the original service.
  *
  * @param {string} name The name of the service to decorate.
- * @param {function()} decorator This function will be invoked when the service needs to be
+ * @param {Function|Array.<string|Function>} decorator This function will be invoked when the service needs to be
  *    instantiated and should return the decorated service instance. The function is called using
  *    the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable.
  *    Local injection arguments:
@@ -644,7 +645,7 @@ function createInjector(modulesToLoad, strictDi) {
           }));
 
 
-  forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); });
+  forEach(loadModules(modulesToLoad), function(fn) { if (fn) instanceInjector.invoke(fn); });
 
   return instanceInjector;
 
@@ -717,6 +718,7 @@ function createInjector(modulesToLoad, strictDi) {
   // Module Loading
   ////////////////////////////////////
   function loadModules(modulesToLoad) {
+    assertArg(isUndefined(modulesToLoad) || isArray(modulesToLoad), 'modulesToLoad', 'not an array');
     var runBlocks = [], moduleFn;
     forEach(modulesToLoad, function(module) {
       if (loadedModules.get(module)) return;
diff --git a/src/jqLite.js b/src/jqLite.js
index df1ab7312ea4..2dd1d6102bae 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -1,5 +1,16 @@
 'use strict';
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 /* global JQLitePrototype: true,
   addEventListenerFn: true,
   removeEventListenerFn: true,
@@ -28,7 +39,7 @@
  * Angular to manipulate the DOM in a cross-browser compatible way. **jqLite** implements only the most
  * commonly needed functionality with the goal of having a very small footprint.</div>
  *
- * To use jQuery, simply load it before `DOMContentLoaded` event fired.
+ * To use `jQuery`, simply ensure it is loaded before the `angular.js` file.
  *
  * <div class="alert">**Note:** all element references in Angular are always wrapped with jQuery or
  * jqLite; they are never raw DOM references.</div>
@@ -44,7 +55,7 @@
  * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
  * - [`clone()`](http://api.jquery.com/clone/)
  * - [`contents()`](http://api.jquery.com/contents/)
- * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`
+ * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`. As a setter, does not convert numbers to strings or append 'px'.
  * - [`data()`](http://api.jquery.com/data/)
  * - [`detach()`](http://api.jquery.com/detach/)
  * - [`empty()`](http://api.jquery.com/empty/)
@@ -171,6 +182,13 @@ function jqLiteAcceptsData(node) {
   return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT;
 }
 
+function jqLiteHasData(node) {
+  for (var key in jqCache[node.ng339]) {
+    return true;
+  }
+  return false;
+}
+
 function jqLiteBuildFragment(html, context) {
   var tmp, tag, wrap,
       fragment = context.createDocumentFragment(),
@@ -545,7 +563,8 @@ function getAliasedAttrName(element, name) {
 
 forEach({
   data: jqLiteData,
-  removeData: jqLiteRemoveData
+  removeData: jqLiteRemoveData,
+  hasData: jqLiteHasData
 }, function(fn, name) {
   JQLite[name] = fn;
 });
@@ -587,6 +606,10 @@ forEach({
   },
 
   attr: function(element, name, value) {
+    var nodeType = element.nodeType;
+    if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT) {
+      return;
+    }
     var lowercasedName = lowercase(name);
     if (BOOLEAN_ATTR[lowercasedName]) {
       if (isDefined(value)) {
diff --git a/src/loader.js b/src/loader.js
index 15ab4bcaa172..a6c14f54ae9d 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -146,7 +146,7 @@ function setupModuleLoader(window) {
            * @description
            * See {@link auto.$provide#provider $provide.provider()}.
            */
-          provider: invokeLater('$provide', 'provider'),
+          provider: invokeLaterAndSetModuleName('$provide', 'provider'),
 
           /**
            * @ngdoc method
@@ -157,7 +157,7 @@ function setupModuleLoader(window) {
            * @description
            * See {@link auto.$provide#factory $provide.factory()}.
            */
-          factory: invokeLater('$provide', 'factory'),
+          factory: invokeLaterAndSetModuleName('$provide', 'factory'),
 
           /**
            * @ngdoc method
@@ -168,7 +168,7 @@ function setupModuleLoader(window) {
            * @description
            * See {@link auto.$provide#service $provide.service()}.
            */
-          service: invokeLater('$provide', 'service'),
+          service: invokeLaterAndSetModuleName('$provide', 'service'),
 
           /**
            * @ngdoc method
@@ -193,6 +193,18 @@ function setupModuleLoader(window) {
            */
           constant: invokeLater('$provide', 'constant', 'unshift'),
 
+           /**
+           * @ngdoc method
+           * @name angular.Module#decorator
+           * @module ng
+           * @param {string} The name of the service to decorate.
+           * @param {Function} This function will be invoked when the service needs to be
+           *                                    instantiated and should return the decorated service instance.
+           * @description
+           * See {@link auto.$provide#decorator $provide.decorator()}.
+           */
+          decorator: invokeLaterAndSetModuleName('$provide', 'decorator'),
+
           /**
            * @ngdoc method
            * @name angular.Module#animation
@@ -206,7 +218,7 @@ function setupModuleLoader(window) {
            *
            *
            * Defines an animation hook that can be later used with
-           * {@link ngAnimate.$animate $animate} service and directives that use this service.
+           * {@link $animate $animate} service and directives that use this service.
            *
            * ```js
            * module.animation('.animation-name', function($inject1, $inject2) {
@@ -225,18 +237,25 @@ function setupModuleLoader(window) {
            * See {@link ng.$animateProvider#register $animateProvider.register()} and
            * {@link ngAnimate ngAnimate module} for more information.
            */
-          animation: invokeLater('$animateProvider', 'register'),
+          animation: invokeLaterAndSetModuleName('$animateProvider', 'register'),
 
           /**
            * @ngdoc method
            * @name angular.Module#filter
            * @module ng
-           * @param {string} name Filter name.
+           * @param {string} name Filter name - this must be a valid angular expression identifier
            * @param {Function} filterFactory Factory function for creating new instance of filter.
            * @description
            * See {@link ng.$filterProvider#register $filterProvider.register()}.
+           *
+           * <div class="alert alert-warning">
+           * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+           * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+           * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+           * (`myapp_subsection_filterx`).
+           * </div>
            */
-          filter: invokeLater('$filterProvider', 'register'),
+          filter: invokeLaterAndSetModuleName('$filterProvider', 'register'),
 
           /**
            * @ngdoc method
@@ -248,7 +267,7 @@ function setupModuleLoader(window) {
            * @description
            * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
            */
-          controller: invokeLater('$controllerProvider', 'register'),
+          controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'),
 
           /**
            * @ngdoc method
@@ -261,7 +280,7 @@ function setupModuleLoader(window) {
            * @description
            * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
            */
-          directive: invokeLater('$compileProvider', 'directive'),
+          directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
 
           /**
            * @ngdoc method
@@ -311,6 +330,19 @@ function setupModuleLoader(window) {
             return moduleInstance;
           };
         }
+
+        /**
+         * @param {string} provider
+         * @param {string} method
+         * @returns {angular.Module}
+         */
+        function invokeLaterAndSetModuleName(provider, method) {
+          return function(recipeName, factoryFunction) {
+            if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name;
+            invokeQueue.push([provider, method, arguments]);
+            return moduleInstance;
+          };
+        }
       });
     };
   });
diff --git a/src/loader.prefix b/src/loader.prefix
index 9c199e92931c..d4ff4e4dcd47 100644
--- a/src/loader.prefix
+++ b/src/loader.prefix
@@ -5,3 +5,4 @@
  */
 'use strict';
 (function() {
+    function isFunction(value) {return typeof value === 'function';};
\ No newline at end of file
diff --git a/src/ng/anchorScroll.js b/src/ng/anchorScroll.js
index baaac2f3fda0..a4b25dff56fc 100644
--- a/src/ng/anchorScroll.js
+++ b/src/ng/anchorScroll.js
@@ -38,9 +38,10 @@ function $AnchorScrollProvider() {
    * @requires $rootScope
    *
    * @description
-   * When called, it checks the current value of {@link ng.$location#hash $location.hash()} and
-   * scrolls to the related element, according to the rules specified in the
-   * [Html5 spec](http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document).
+   * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the
+   * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified
+   * in the
+   * [HTML5 spec](http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document).
    *
    * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to
    * match any anchor whenever it changes. This can be disabled by calling
@@ -49,6 +50,9 @@ function $AnchorScrollProvider() {
    * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a
    * vertical scroll-offset (either fixed or dynamic).
    *
+   * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of
+   *                       {@link ng.$location#hash $location.hash()} will be used.
+   *
    * @property {(number|function|jqLite)} yOffset
    * If set, specifies a vertical scroll-offset. This is often useful when there are fixed
    * positioned elements at the top of the page, such as navbars, headers etc.
@@ -232,8 +236,9 @@ function $AnchorScrollProvider() {
       }
     }
 
-    function scroll() {
-      var hash = $location.hash(), elm;
+    function scroll(hash) {
+      hash = isString(hash) ? hash : $location.hash();
+      var elm;
 
       // empty hash, scroll to the top of the page
       if (!hash) scrollTo(null);
diff --git a/src/ng/animate.js b/src/ng/animate.js
index 752ed0e15f6f..88e0e160592c 100644
--- a/src/ng/animate.js
+++ b/src/ng/animate.js
@@ -1,6 +1,168 @@
 'use strict';
 
 var $animateMinErr = minErr('$animate');
+var ELEMENT_NODE = 1;
+var NG_ANIMATE_CLASSNAME = 'ng-animate';
+
+function mergeClasses(a,b) {
+  if (!a && !b) return '';
+  if (!a) return b;
+  if (!b) return a;
+  if (isArray(a)) a = a.join(' ');
+  if (isArray(b)) b = b.join(' ');
+  return a + ' ' + b;
+}
+
+function extractElementNode(element) {
+  for (var i = 0; i < element.length; i++) {
+    var elm = element[i];
+    if (elm.nodeType === ELEMENT_NODE) {
+      return elm;
+    }
+  }
+}
+
+function splitClasses(classes) {
+  if (isString(classes)) {
+    classes = classes.split(' ');
+  }
+
+  // Use createMap() to prevent class assumptions involving property names in
+  // Object.prototype
+  var obj = createMap();
+  forEach(classes, function(klass) {
+    // sometimes the split leaves empty string values
+    // incase extra spaces were applied to the options
+    if (klass.length) {
+      obj[klass] = true;
+    }
+  });
+  return obj;
+}
+
+// if any other type of options value besides an Object value is
+// passed into the $animate.method() animation then this helper code
+// will be run which will ignore it. While this patch is not the
+// greatest solution to this, a lot of existing plugins depend on
+// $animate to either call the callback (< 1.2) or return a promise
+// that can be changed. This helper function ensures that the options
+// are wiped clean incase a callback function is provided.
+function prepareAnimateOptions(options) {
+  return isObject(options)
+      ? options
+      : {};
+}
+
+var $$CoreAnimateRunnerProvider = function() {
+  this.$get = ['$q', '$$rAF', function($q, $$rAF) {
+    function AnimateRunner() {}
+    AnimateRunner.all = noop;
+    AnimateRunner.chain = noop;
+    AnimateRunner.prototype = {
+      end: noop,
+      cancel: noop,
+      resume: noop,
+      pause: noop,
+      complete: noop,
+      then: function(pass, fail) {
+        return $q(function(resolve) {
+          $$rAF(function() {
+            resolve();
+          });
+        }).then(pass, fail);
+      }
+    };
+    return AnimateRunner;
+  }];
+};
+
+// this is prefixed with Core since it conflicts with
+// the animateQueueProvider defined in ngAnimate/animateQueue.js
+var $$CoreAnimateQueueProvider = function() {
+  var postDigestQueue = new HashMap();
+  var postDigestElements = [];
+
+  this.$get = ['$$AnimateRunner', '$rootScope',
+       function($$AnimateRunner,   $rootScope) {
+    return {
+      enabled: noop,
+      on: noop,
+      off: noop,
+      pin: noop,
+
+      push: function(element, event, options, domOperation) {
+        domOperation        && domOperation();
+
+        options = options || {};
+        options.from        && element.css(options.from);
+        options.to          && element.css(options.to);
+
+        if (options.addClass || options.removeClass) {
+          addRemoveClassesPostDigest(element, options.addClass, options.removeClass);
+        }
+
+        return new $$AnimateRunner(); // jshint ignore:line
+      }
+    };
+
+    function addRemoveClassesPostDigest(element, add, remove) {
+      var classVal, data = postDigestQueue.get(element);
+
+      if (!data) {
+        postDigestQueue.put(element, data = {});
+        postDigestElements.push(element);
+      }
+
+      var updateData = function(classes, value) {
+        var changed = false;
+        if (classes) {
+          classes = isString(classes) ? classes.split(' ') :
+                    isArray(classes) ? classes : [];
+          forEach(classes, function(className) {
+            if (className) {
+              changed = true;
+              data[className] = value;
+            }
+          });
+        }
+        return changed;
+      };
+
+      var classesAdded = updateData(add, true);
+      var classesRemoved = updateData(remove, false);
+      if ((!classesAdded && !classesRemoved) || postDigestElements.length > 1) return;
+
+      $rootScope.$$postDigest(function() {
+        forEach(postDigestElements, function(element) {
+          var data = postDigestQueue.get(element);
+          if (data) {
+            var existing = splitClasses(element.attr('class'));
+            var toAdd = '';
+            var toRemove = '';
+            forEach(data, function(status, className) {
+              var hasClass = !!existing[className];
+              if (status !== hasClass) {
+                if (status) {
+                  toAdd += (toAdd.length ? ' ' : '') + className;
+                } else {
+                  toRemove += (toRemove.length ? ' ' : '') + className;
+                }
+              }
+            });
+
+            forEach(element, function(elm) {
+              toAdd    && jqLiteAddClass(elm, toAdd);
+              toRemove && jqLiteRemoveClass(elm, toRemove);
+            });
+            postDigestQueue.remove(element);
+          }
+        });
+
+        postDigestElements.length = 0;
+      });
+    }
+  }];
+};
 
 /**
  * @ngdoc provider
@@ -8,20 +170,18 @@ var $animateMinErr = minErr('$animate');
  *
  * @description
  * Default implementation of $animate that doesn't perform any animations, instead just
- * synchronously performs DOM
- * updates and calls done() callbacks.
+ * synchronously performs DOM updates and resolves the returned runner promise.
  *
- * In order to enable animations the ngAnimate module has to be loaded.
+ * In order to enable animations the `ngAnimate` module has to be loaded.
  *
- * To see the functional implementation check out src/ngAnimate/animate.js
+ * To see the functional implementation check out `src/ngAnimate/animate.js`.
  */
 var $AnimateProvider = ['$provide', function($provide) {
+  var provider = this;
 
+  this.$$registeredAnimations = Object.create(null);
 
-  this.$$selectors = {};
-
-
-  /**
+   /**
    * @ngdoc method
    * @name $animateProvider#register
    *
@@ -30,33 +190,43 @@ var $AnimateProvider = ['$provide', function($provide) {
    * animation object which contains callback functions for each event that is expected to be
    * animated.
    *
-   *   * `eventFn`: `function(Element, doneFunction)` The element to animate, the `doneFunction`
-   *   must be called once the element animation is complete. If a function is returned then the
-   *   animation service will use this function to cancel the animation whenever a cancel event is
-   *   triggered.
+   *   * `eventFn`: `function(element, ... , doneFunction, options)`
+   *   The element to animate, the `doneFunction` and the options fed into the animation. Depending
+   *   on the type of animation additional arguments will be injected into the animation function. The
+   *   list below explains the function signatures for the different animation methods:
    *
+   *   - setClass: function(element, addedClasses, removedClasses, doneFunction, options)
+   *   - addClass: function(element, addedClasses, doneFunction, options)
+   *   - removeClass: function(element, removedClasses, doneFunction, options)
+   *   - enter, leave, move: function(element, doneFunction, options)
+   *   - animate: function(element, fromStyles, toStyles, doneFunction, options)
+   *
+   *   Make sure to trigger the `doneFunction` once the animation is fully complete.
    *
    * ```js
    *   return {
-     *     eventFn : function(element, done) {
-     *       //code to run the animation
-     *       //once complete, then run done()
-     *       return function cancellationFunction() {
-     *         //code to cancel the animation
-     *       }
-     *     }
-     *   }
+   *     //enter, leave, move signature
+   *     eventFn : function(element, done, options) {
+   *       //code to run the animation
+   *       //once complete, then run done()
+   *       return function endFunction(wasCancelled) {
+   *         //code to cancel the animation
+   *       }
+   *     }
+   *   }
    * ```
    *
-   * @param {string} name The name of the animation.
+   * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to).
    * @param {Function} factory The factory function that will be executed to return the animation
    *                           object.
    */
   this.register = function(name, factory) {
+    if (name && name.charAt(0) !== '.') {
+      throw $animateMinErr('notcsel', "Expecting class selector starting with '.' got '{0}'.", name);
+    }
+
     var key = name + '-animation';
-    if (name && name.charAt(0) != '.') throw $animateMinErr('notcsel',
-        "Expecting class selector starting with '.' got '{0}'.", name);
-    this.$$selectors[name.substr(1)] = key;
+    provider.$$registeredAnimations[name.substr(1)] = key;
     $provide.factory(key, factory);
   };
 
@@ -67,8 +237,8 @@ var $AnimateProvider = ['$provide', function($provide) {
    * @description
    * Sets and/or returns the CSS class regular expression that is checked when performing
    * an animation. Upon bootstrap the classNameFilter value is not set at all and will
-   * therefore enable $animate to attempt to perform an animation on any element.
-   * When setting the classNameFilter value, animations will only be performed on elements
+   * therefore enable $animate to attempt to perform an animation on any element that is triggered.
+   * When setting the `classNameFilter` value, animations will only be performed on elements
    * that successfully match the filter expression. This in turn can boost performance
    * for low-powered devices as well as applications containing a lot of structural operations.
    * @param {RegExp=} expression The className expression which will be checked against all animations
@@ -77,102 +247,167 @@ var $AnimateProvider = ['$provide', function($provide) {
   this.classNameFilter = function(expression) {
     if (arguments.length === 1) {
       this.$$classNameFilter = (expression instanceof RegExp) ? expression : null;
-    }
-    return this.$$classNameFilter;
-  };
-
-  this.$get = ['$$q', '$$asyncCallback', '$rootScope', function($$q, $$asyncCallback, $rootScope) {
+      if (this.$$classNameFilter) {
+        var reservedRegex = new RegExp("(\\s+|\\/)" + NG_ANIMATE_CLASSNAME + "(\\s+|\\/)");
+        if (reservedRegex.test(this.$$classNameFilter.toString())) {
+          throw $animateMinErr('nongcls','$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME);
 
-    var currentDefer;
-
-    function runAnimationPostDigest(fn) {
-      var cancelFn, defer = $$q.defer();
-      defer.promise.$$cancelFn = function ngAnimateMaybeCancel() {
-        cancelFn && cancelFn();
-      };
-
-      $rootScope.$$postDigest(function ngAnimatePostDigest() {
-        cancelFn = fn(function ngAnimateNotifyComplete() {
-          defer.resolve();
-        });
-      });
-
-      return defer.promise;
-    }
-
-    function resolveElementClasses(element, classes) {
-      var toAdd = [], toRemove = [];
-
-      var hasClasses = createMap();
-      forEach((element.attr('class') || '').split(/\s+/), function(className) {
-        hasClasses[className] = true;
-      });
-
-      forEach(classes, function(status, className) {
-        var hasClass = hasClasses[className];
-
-        // If the most recent class manipulation (via $animate) was to remove the class, and the
-        // element currently has the class, the class is scheduled for removal. Otherwise, if
-        // the most recent class manipulation (via $animate) was to add the class, and the
-        // element does not currently have the class, the class is scheduled to be added.
-        if (status === false && hasClass) {
-          toRemove.push(className);
-        } else if (status === true && !hasClass) {
-          toAdd.push(className);
         }
-      });
-
-      return (toAdd.length + toRemove.length) > 0 &&
-        [toAdd.length ? toAdd : null, toRemove.length ? toRemove : null];
-    }
-
-    function cachedClassManipulation(cache, classes, op) {
-      for (var i=0, ii = classes.length; i < ii; ++i) {
-        var className = classes[i];
-        cache[className] = op;
-      }
-    }
-
-    function asyncPromise() {
-      // only serve one instance of a promise in order to save CPU cycles
-      if (!currentDefer) {
-        currentDefer = $$q.defer();
-        $$asyncCallback(function() {
-          currentDefer.resolve();
-          currentDefer = null;
-        });
       }
-      return currentDefer.promise;
     }
+    return this.$$classNameFilter;
+  };
 
-    function applyStyles(element, options) {
-      if (angular.isObject(options)) {
-        var styles = extend(options.from || {}, options.to || {});
-        element.css(styles);
+  this.$get = ['$$animateQueue', function($$animateQueue) {
+    function domInsert(element, parentElement, afterElement) {
+      // if for some reason the previous element was removed
+      // from the dom sometime before this code runs then let's
+      // just stick to using the parent element as the anchor
+      if (afterElement) {
+        var afterNode = extractElementNode(afterElement);
+        if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) {
+          afterElement = null;
+        }
       }
+      afterElement ? afterElement.after(element) : parentElement.prepend(element);
     }
 
     /**
-     *
      * @ngdoc service
      * @name $animate
-     * @description The $animate service provides rudimentary DOM manipulation functions to
-     * insert, remove and move elements within the DOM, as well as adding and removing classes.
-     * This service is the core service used by the ngAnimate $animator service which provides
-     * high-level animation hooks for CSS and JavaScript.
+     * @description The $animate service exposes a series of DOM utility methods that provide support
+     * for animation hooks. The default behavior is the application of DOM operations, however,
+     * when an animation is detected (and animations are enabled), $animate will do the heavy lifting
+     * to ensure that animation runs with the triggered DOM operation.
+     *
+     * By default $animate doesn't trigger an animations. This is because the `ngAnimate` module isn't
+     * included and only when it is active then the animation hooks that `$animate` triggers will be
+     * functional. Once active then all structural `ng-` directives will trigger animations as they perform
+     * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`,
+     * `ngShow`, `ngHide` and `ngMessages` also provide support for animations.
      *
-     * $animate is available in the AngularJS core, however, the ngAnimate module must be included
-     * to enable full out animation support. Otherwise, $animate will only perform simple DOM
-     * manipulation operations.
+     * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives.
      *
-     * To learn more about enabling animation support, click here to visit the {@link ngAnimate
-     * ngAnimate module page} as well as the {@link ngAnimate.$animate ngAnimate $animate service
-     * page}.
+     * To learn more about enabling animation support, click here to visit the
+     * {@link ngAnimate ngAnimate module page}.
      */
     return {
-      animate: function(element, from, to) {
-        applyStyles(element, { from: from, to: to });
-        return asyncPromise();
+      // we don't call it directly since non-existant arguments may
+      // be interpreted as null within the sub enabled function
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#on
+       * @kind function
+       * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...)
+       *    has fired on the given element or among any of its children. Once the listener is fired, the provided callback
+       *    is fired with the following params:
+       *
+       * ```js
+       * $animate.on('enter', container,
+       *    function callback(element, phase) {
+       *      // cool we detected an enter animation within the container
+       *    }
+       * );
+       * ```
+       *
+       * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...)
+       * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself
+       *     as well as among its children
+       * @param {Function} callback the callback function that will be fired when the listener is triggered
+       *
+       * The arguments present in the callback function are:
+       * * `element` - The captured DOM element that the animation was fired on.
+       * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends).
+       */
+      on: $$animateQueue.on,
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#off
+       * @kind function
+       * @description Deregisters an event listener based on the event which has been associated with the provided element. This method
+       * can be used in three different ways depending on the arguments:
+       *
+       * ```js
+       * // remove all the animation event listeners listening for `enter`
+       * $animate.off('enter');
+       *
+       * // remove all the animation event listeners listening for `enter` on the given element and its children
+       * $animate.off('enter', container);
+       *
+       * // remove the event listener function provided by `listenerFn` that is set
+       * // to listen for `enter` on the given `element` as well as its children
+       * $animate.off('enter', container, callback);
+       * ```
+       *
+       * @param {string} event the animation event (e.g. enter, leave, move, addClass, removeClass, etc...)
+       * @param {DOMElement=} container the container element the event listener was placed on
+       * @param {Function=} callback the callback function that was registered as the listener
+       */
+      off: $$animateQueue.off,
+
+      /**
+       * @ngdoc method
+       * @name $animate#pin
+       * @kind function
+       * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists
+       *    outside of the DOM structure of the Angular application. By doing so, any animation triggered via `$animate` can be issued on the
+       *    element despite being outside the realm of the application or within another application. Say for example if the application
+       *    was bootstrapped on an element that is somewhere inside of the `<body>` tag, but we wanted to allow for an element to be situated
+       *    as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind
+       *    that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association.
+       *
+       *    Note that this feature is only active when the `ngAnimate` module is used.
+       *
+       * @param {DOMElement} element the external element that will be pinned
+       * @param {DOMElement} parentElement the host parent element that will be associated with the external element
+       */
+      pin: $$animateQueue.pin,
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#enabled
+       * @kind function
+       * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This
+       * function can be called in four ways:
+       *
+       * ```js
+       * // returns true or false
+       * $animate.enabled();
+       *
+       * // changes the enabled state for all animations
+       * $animate.enabled(false);
+       * $animate.enabled(true);
+       *
+       * // returns true or false if animations are enabled for an element
+       * $animate.enabled(element);
+       *
+       * // changes the enabled state for an element and its children
+       * $animate.enabled(element, true);
+       * $animate.enabled(element, false);
+       * ```
+       *
+       * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state
+       * @param {boolean=} enabled whether or not the animations will be enabled for the element
+       *
+       * @return {boolean} whether or not animations are enabled
+       */
+      enabled: $$animateQueue.enabled,
+
+      /**
+       * @ngdoc method
+       * @name $animate#cancel
+       * @kind function
+       * @description Cancels the provided animation.
+       *
+       * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
+       */
+      cancel: function(runner) {
+        runner.end && runner.end();
       },
 
       /**
@@ -180,192 +415,176 @@ var $AnimateProvider = ['$provide', function($provide) {
        * @ngdoc method
        * @name $animate#enter
        * @kind function
-       * @description Inserts the element into the DOM either after the `after` element or
-       * as the first child within the `parent` element. When the function is called a promise
-       * is returned that will be resolved at a later time.
+       * @description Inserts the element into the DOM either after the `after` element (if provided) or
+       *   as the first child within the `parent` element and then triggers an animation.
+       *   A promise is returned that will be resolved during the next digest once the animation
+       *   has completed.
+       *
        * @param {DOMElement} element the element which will be inserted into the DOM
        * @param {DOMElement} parent the parent element which will append the element as
-       *   a child (if the after element is not present)
-       * @param {DOMElement} after the sibling element which will append the element
-       *   after itself
-       * @param {object=} options an optional collection of styles that will be applied to the element.
+       *   a child (so long as the after element is not present)
+       * @param {DOMElement=} after the sibling element after which the element will be appended
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
        * @return {Promise} the animation callback promise
        */
       enter: function(element, parent, after, options) {
-        applyStyles(element, options);
-        after ? after.after(element)
-              : parent.prepend(element);
-        return asyncPromise();
+        parent = parent && jqLite(parent);
+        after = after && jqLite(after);
+        parent = parent || after.parent();
+        domInsert(element, parent, after);
+        return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options));
       },
 
       /**
        *
        * @ngdoc method
-       * @name $animate#leave
+       * @name $animate#move
        * @kind function
-       * @description Removes the element from the DOM. When the function is called a promise
-       * is returned that will be resolved at a later time.
-       * @param {DOMElement} element the element which will be removed from the DOM
-       * @param {object=} options an optional collection of options that will be applied to the element.
+       * @description Inserts (moves) the element into its new position in the DOM either after
+       *   the `after` element (if provided) or as the first child within the `parent` element
+       *   and then triggers an animation. A promise is returned that will be resolved
+       *   during the next digest once the animation has completed.
+       *
+       * @param {DOMElement} element the element which will be moved into the new DOM position
+       * @param {DOMElement} parent the parent element which will append the element as
+       *   a child (so long as the after element is not present)
+       * @param {DOMElement=} after the sibling element after which the element will be appended
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
        * @return {Promise} the animation callback promise
        */
-      leave: function(element, options) {
-        element.remove();
-        return asyncPromise();
+      move: function(element, parent, after, options) {
+        parent = parent && jqLite(parent);
+        after = after && jqLite(after);
+        parent = parent || after.parent();
+        domInsert(element, parent, after);
+        return $$animateQueue.push(element, 'move', prepareAnimateOptions(options));
       },
 
       /**
-       *
        * @ngdoc method
-       * @name $animate#move
+       * @name $animate#leave
        * @kind function
-       * @description Moves the position of the provided element within the DOM to be placed
-       * either after the `after` element or inside of the `parent` element. When the function
-       * is called a promise is returned that will be resolved at a later time.
-       *
-       * @param {DOMElement} element the element which will be moved around within the
-       *   DOM
-       * @param {DOMElement} parent the parent element where the element will be
-       *   inserted into (if the after element is not present)
-       * @param {DOMElement} after the sibling element where the element will be
-       *   positioned next to
-       * @param {object=} options an optional collection of options that will be applied to the element.
+       * @description Triggers an animation and then removes the element from the DOM.
+       * When the function is called a promise is returned that will be resolved during the next
+       * digest once the animation has completed.
+       *
+       * @param {DOMElement} element the element which will be removed from the DOM
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
        * @return {Promise} the animation callback promise
        */
-      move: function(element, parent, after, options) {
-        // Do not remove element before insert. Removing will cause data associated with the
-        // element to be dropped. Insert will implicitly do the remove.
-        return this.enter(element, parent, after, options);
+      leave: function(element, options) {
+        return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() {
+          element.remove();
+        });
       },
 
       /**
-       *
        * @ngdoc method
        * @name $animate#addClass
        * @kind function
-       * @description Adds the provided className CSS class value to the provided element.
-       * When the function is called a promise is returned that will be resolved at a later time.
-       * @param {DOMElement} element the element which will have the className value
-       *   added to it
-       * @param {string} className the CSS class which will be added to the element
-       * @param {object=} options an optional collection of options that will be applied to the element.
+       *
+       * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon
+       *   execution, the addClass operation will only be handled after the next digest and it will not trigger an
+       *   animation if element already contains the CSS class or if the class is removed at a later step.
+       *   Note that class-based animations are treated differently compared to structural animations
+       *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *   depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
        * @return {Promise} the animation callback promise
        */
       addClass: function(element, className, options) {
-        return this.setClass(element, className, [], options);
-      },
-
-      $$addClassImmediately: function(element, className, options) {
-        element = jqLite(element);
-        className = !isString(className)
-                        ? (isArray(className) ? className.join(' ') : '')
-                        : className;
-        forEach(element, function(element) {
-          jqLiteAddClass(element, className);
-        });
-        applyStyles(element, options);
-        return asyncPromise();
+        options = prepareAnimateOptions(options);
+        options.addClass = mergeClasses(options.addclass, className);
+        return $$animateQueue.push(element, 'addClass', options);
       },
 
       /**
-       *
        * @ngdoc method
        * @name $animate#removeClass
        * @kind function
-       * @description Removes the provided className CSS class value from the provided element.
-       * When the function is called a promise is returned that will be resolved at a later time.
-       * @param {DOMElement} element the element which will have the className value
-       *   removed from it
-       * @param {string} className the CSS class which will be removed from the element
-       * @param {object=} options an optional collection of options that will be applied to the element.
+       *
+       * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon
+       *   execution, the removeClass operation will only be handled after the next digest and it will not trigger an
+       *   animation if element does not contain the CSS class or if the class is added at a later step.
+       *   Note that class-based animations are treated differently compared to structural animations
+       *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *   depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
        * @return {Promise} the animation callback promise
        */
       removeClass: function(element, className, options) {
-        return this.setClass(element, [], className, options);
-      },
-
-      $$removeClassImmediately: function(element, className, options) {
-        element = jqLite(element);
-        className = !isString(className)
-                        ? (isArray(className) ? className.join(' ') : '')
-                        : className;
-        forEach(element, function(element) {
-          jqLiteRemoveClass(element, className);
-        });
-        applyStyles(element, options);
-        return asyncPromise();
+        options = prepareAnimateOptions(options);
+        options.removeClass = mergeClasses(options.removeClass, className);
+        return $$animateQueue.push(element, 'removeClass', options);
       },
 
       /**
-       *
        * @ngdoc method
        * @name $animate#setClass
        * @kind function
-       * @description Adds and/or removes the given CSS classes to and from the element.
-       * When the function is called a promise is returned that will be resolved at a later time.
-       * @param {DOMElement} element the element which will have its CSS classes changed
-       *   removed from it
-       * @param {string} add the CSS classes which will be added to the element
-       * @param {string} remove the CSS class which will be removed from the element
-       * @param {object=} options an optional collection of options that will be applied to the element.
+       *
+       * @description Performs both the addition and removal of a CSS classes on an element and (during the process)
+       *    triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and
+       *    `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has
+       *    passed. Note that class-based animations are treated differently compared to structural animations
+       *    (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *    depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
+       * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
        * @return {Promise} the animation callback promise
        */
       setClass: function(element, add, remove, options) {
-        var self = this;
-        var STORAGE_KEY = '$$animateClasses';
-        var createdCache = false;
-        element = jqLite(element);
-
-        var cache = element.data(STORAGE_KEY);
-        if (!cache) {
-          cache = {
-            classes: {},
-            options: options
-          };
-          createdCache = true;
-        } else if (options && cache.options) {
-          cache.options = angular.extend(cache.options || {}, options);
-        }
-
-        var classes = cache.classes;
-
-        add = isArray(add) ? add : add.split(' ');
-        remove = isArray(remove) ? remove : remove.split(' ');
-        cachedClassManipulation(classes, add, true);
-        cachedClassManipulation(classes, remove, false);
-
-        if (createdCache) {
-          cache.promise = runAnimationPostDigest(function(done) {
-            var cache = element.data(STORAGE_KEY);
-            element.removeData(STORAGE_KEY);
-
-            // in the event that the element is removed before postDigest
-            // is run then the cache will be undefined and there will be
-            // no need anymore to add or remove and of the element classes
-            if (cache) {
-              var classes = resolveElementClasses(element, cache.classes);
-              if (classes) {
-                self.$$setClassImmediately(element, classes[0], classes[1], cache.options);
-              }
-            }
-
-            done();
-          });
-          element.data(STORAGE_KEY, cache);
-        }
-
-        return cache.promise;
-      },
-
-      $$setClassImmediately: function(element, add, remove, options) {
-        add && this.$$addClassImmediately(element, add);
-        remove && this.$$removeClassImmediately(element, remove);
-        applyStyles(element, options);
-        return asyncPromise();
+        options = prepareAnimateOptions(options);
+        options.addClass = mergeClasses(options.addClass, add);
+        options.removeClass = mergeClasses(options.removeClass, remove);
+        return $$animateQueue.push(element, 'setClass', options);
       },
 
-      enabled: noop,
-      cancel: noop
+      /**
+       * @ngdoc method
+       * @name $animate#animate
+       * @kind function
+       *
+       * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element.
+       * If any detected CSS transition, keyframe or JavaScript matches the provided className value then the animation will take
+       * on the provided styles. For example, if a transition animation is set for the given className then the provided from and
+       * to styles will be applied alongside the given transition. If a JavaScript animation is detected then the provided styles
+       * will be given in as function paramters into the `animate` method (or as apart of the `options` parameter).
+       *
+       * @param {DOMElement} element the element which the CSS styles will be applied to
+       * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation.
+       * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation.
+       * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
+       *    this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
+       *    (Note that if no animation is detected then this value will not be appplied to the element.)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      animate: function(element, from, to, className, options) {
+        options = prepareAnimateOptions(options);
+        options.from = options.from ? extend(options.from, from) : from;
+        options.to   = options.to   ? extend(options.to, to)     : to;
+
+        className = className || 'ng-inline-animate';
+        options.tempClasses = mergeClasses(options.tempClasses, className);
+        return $$animateQueue.push(element, 'animate', options);
+      }
     };
   }];
 }];
diff --git a/src/ng/asyncCallback.js b/src/ng/asyncCallback.js
deleted file mode 100644
index 5cd9dec8413d..000000000000
--- a/src/ng/asyncCallback.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict';
-
-function $$AsyncCallbackProvider() {
-  this.$get = ['$$rAF', '$timeout', function($$rAF, $timeout) {
-    return $$rAF.supported
-      ? function(fn) { return $$rAF(fn); }
-      : function(fn) {
-        return $timeout(fn, 0, false);
-      };
-  }];
-}
diff --git a/src/ng/browser.js b/src/ng/browser.js
index af2dd70e76a9..928de956cda2 100644
--- a/src/ng/browser.js
+++ b/src/ng/browser.js
@@ -63,7 +63,7 @@ function Browser(window, document, $log, $sniffer) {
 
   function getHash(url) {
     var index = url.indexOf('#');
-    return index === -1 ? '' : url.substr(index + 1);
+    return index === -1 ? '' : url.substr(index);
   }
 
   /**
@@ -73,11 +73,6 @@ function Browser(window, document, $log, $sniffer) {
    * @param {function()} callback Function that will be called when no outstanding request
    */
   self.notifyWhenNoOutstandingRequests = function(callback) {
-    // force browser to execute all pollFns - this is needed so that cookies and other pollers fire
-    // at some deterministic time in respect to the test runner's actions. Leaving things up to the
-    // regular poller would result in flaky tests.
-    forEach(pollFns, function(pollFn) { pollFn(); });
-
     if (outstandingRequestCount === 0) {
       callback();
     } else {
@@ -85,44 +80,6 @@ function Browser(window, document, $log, $sniffer) {
     }
   };
 
-  //////////////////////////////////////////////////////////////
-  // Poll Watcher API
-  //////////////////////////////////////////////////////////////
-  var pollFns = [],
-      pollTimeout;
-
-  /**
-   * @name $browser#addPollFn
-   *
-   * @param {function()} fn Poll function to add
-   *
-   * @description
-   * Adds a function to the list of functions that poller periodically executes,
-   * and starts polling if not started yet.
-   *
-   * @returns {function()} the added function
-   */
-  self.addPollFn = function(fn) {
-    if (isUndefined(pollTimeout)) startPoller(100, setTimeout);
-    pollFns.push(fn);
-    return fn;
-  };
-
-  /**
-   * @param {number} interval How often should browser call poll functions (ms)
-   * @param {function()} setTimeout Reference to a real or fake `setTimeout` function.
-   *
-   * @description
-   * Configures the poller to run in the specified intervals, using the specified
-   * setTimeout fn and kicks it off.
-   */
-  function startPoller(interval, setTimeout) {
-    (function check() {
-      forEach(pollFns, function(pollFn) { pollFn(); });
-      pollTimeout = setTimeout(check, interval);
-    })();
-  }
-
   //////////////////////////////////////////////////////////////
   // URL API
   //////////////////////////////////////////////////////////////
@@ -190,7 +147,7 @@ function Browser(window, document, $log, $sniffer) {
         // Do the assignment again so that those two variables are referentially identical.
         lastHistoryState = cachedState;
       } else {
-        if (!sameBase) {
+        if (!sameBase || reloadLocation) {
           reloadLocation = url;
         }
         if (replace) {
@@ -233,11 +190,19 @@ function Browser(window, document, $log, $sniffer) {
     fireUrlChange();
   }
 
+  function getCurrentState() {
+    try {
+      return history.state;
+    } catch (e) {
+      // MSIE can reportedly throw when there is no state (UNCONFIRMED).
+    }
+  }
+
   // This variable should be used *only* inside the cacheState function.
   var lastCachedState = null;
   function cacheState() {
     // This should be the only place in $browser where `history.state` is read.
-    cachedState = window.history.state;
+    cachedState = getCurrentState();
     cachedState = isUndefined(cachedState) ? null : cachedState;
 
     // Prevent callbacks fo fire twice if both hashchange & popstate were fired.
@@ -299,6 +264,16 @@ function Browser(window, document, $log, $sniffer) {
     return callback;
   };
 
+  /**
+   * @private
+   * Remove popstate and hashchange handler from window.
+   *
+   * NOTE: this api is intended for use only by $rootScope.
+   */
+  self.$$applicationDestroyed = function() {
+    jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange);
+  };
+
   /**
    * Checks whether the url has changed outside of Angular.
    * Needs to be exported to be able to check for changes that have been done in sync,
@@ -324,89 +299,6 @@ function Browser(window, document, $log, $sniffer) {
     return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
   };
 
-  //////////////////////////////////////////////////////////////
-  // Cookies API
-  //////////////////////////////////////////////////////////////
-  var lastCookies = {};
-  var lastCookieString = '';
-  var cookiePath = self.baseHref();
-
-  function safeDecodeURIComponent(str) {
-    try {
-      return decodeURIComponent(str);
-    } catch (e) {
-      return str;
-    }
-  }
-
-  /**
-   * @name $browser#cookies
-   *
-   * @param {string=} name Cookie name
-   * @param {string=} value Cookie value
-   *
-   * @description
-   * The cookies method provides a 'private' low level access to browser cookies.
-   * It is not meant to be used directly, use the $cookie service instead.
-   *
-   * The return values vary depending on the arguments that the method was called with as follows:
-   *
-   * - cookies() -> hash of all cookies, this is NOT a copy of the internal state, so do not modify
-   *   it
-   * - cookies(name, value) -> set name to value, if value is undefined delete the cookie
-   * - cookies(name) -> the same as (name, undefined) == DELETES (no one calls it right now that
-   *   way)
-   *
-   * @returns {Object} Hash of all cookies (if called without any parameter)
-   */
-  self.cookies = function(name, value) {
-    var cookieLength, cookieArray, cookie, i, index;
-
-    if (name) {
-      if (value === undefined) {
-        rawDocument.cookie = encodeURIComponent(name) + "=;path=" + cookiePath +
-                                ";expires=Thu, 01 Jan 1970 00:00:00 GMT";
-      } else {
-        if (isString(value)) {
-          cookieLength = (rawDocument.cookie = encodeURIComponent(name) + '=' + encodeURIComponent(value) +
-                                ';path=' + cookiePath).length + 1;
-
-          // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
-          // - 300 cookies
-          // - 20 cookies per unique domain
-          // - 4096 bytes per cookie
-          if (cookieLength > 4096) {
-            $log.warn("Cookie '" + name +
-              "' possibly not set or overflowed because it was too large (" +
-              cookieLength + " > 4096 bytes)!");
-          }
-        }
-      }
-    } else {
-      if (rawDocument.cookie !== lastCookieString) {
-        lastCookieString = rawDocument.cookie;
-        cookieArray = lastCookieString.split("; ");
-        lastCookies = {};
-
-        for (i = 0; i < cookieArray.length; i++) {
-          cookie = cookieArray[i];
-          index = cookie.indexOf('=');
-          if (index > 0) { //ignore nameless cookies
-            name = safeDecodeURIComponent(cookie.substring(0, index));
-            // the first value that is seen for a cookie is the most
-            // specific one.  values for the same cookie name that
-            // follow are for less specific paths.
-            if (lastCookies[name] === undefined) {
-              lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1));
-            }
-          }
-        }
-      }
-      return lastCookies;
-    }
-  };
-
-
   /**
    * @name $browser#defer
    * @param {function()} fn A function, who's execution should be deferred.
diff --git a/src/ng/cacheFactory.js b/src/ng/cacheFactory.js
index 41488d45af72..377c0c820d54 100644
--- a/src/ng/cacheFactory.js
+++ b/src/ng/cacheFactory.js
@@ -372,7 +372,7 @@ function $CacheFactoryProvider() {
  * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (IE,
  * element with ng-app attribute), otherwise the template will be ignored.
  *
- * Adding via the $templateCache service:
+ * Adding via the `$templateCache` service:
  *
  * ```js
  * var myApp = angular.module('myApp', []);
diff --git a/src/ng/compile.js b/src/ng/compile.js
index 34e38137606f..d8ed0c5e0e3d 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -1,5 +1,16 @@
 'use strict';
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 /* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE!
  *
  * DOM-related variables:
@@ -65,6 +76,7 @@
  *       scope: false,
  *       controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
  *       controllerAs: 'stringIdentifier',
+ *       bindToController: false,
  *       require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
  *       compile: function compile(tElement, tAttrs, transclude) {
  *         return {
@@ -211,7 +223,8 @@
  * Require another directive and inject its controller as the fourth argument to the linking function. The
  * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the
  * injected argument will be an array in corresponding order. If no such directive can be
- * found, or if the directive does not have a controller, then an error is raised. The name can be prefixed with:
+ * found, or if the directive does not have a controller, then an error is raised (unless no link function
+ * is specified, in which case error checking is skipped). The name can be prefixed with:
  *
  * * (no prefix) - Locate the required controller on the current element. Throw an error if not found.
  * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found.
@@ -346,7 +359,7 @@
  * `templateUrl` declaration or manual compilation inside the compile function.
  * </div>
  *
- * <div class="alert alert-error">
+ * <div class="alert alert-danger">
  * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it
  *   e.g. does not know about the right outer scope. Please use the transclude function that is passed
  *   to the link function instead.
@@ -383,9 +396,18 @@
  *   * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared
  *     between all directive linking functions.
  *
- *   * `controller` - a controller instance - A controller instance if at least one directive on the
- *     element defines a controller. The controller is shared among all the directives, which allows
- *     the directives to use the controllers as a communication channel.
+ *   * `controller` - the directive's required controller instance(s) - Instances are shared
+ *     among all directives, which allows the directives to use the controllers as a communication
+ *     channel. The exact value depends on the directive's `require` property:
+ *       * no controller(s) required: the directive's own controller, or `undefined` if it doesn't have one
+ *       * `string`: the controller instance
+ *       * `array`: array of controller instances
+ *
+ *     If a required controller cannot be found, and it is optional, the instance is `null`,
+ *     otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown.
+ *
+ *     Note that you can also require the directive's own controller - it will be made available like
+ *     any other controller.
  *
  *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
  *     This is the same as the `$transclude`
@@ -411,7 +433,7 @@
  *
  * ### Transclusion
  *
- * Transclusion is the process of extracting a collection of DOM element from one part of the DOM and
+ * Transclusion is the process of extracting a collection of DOM elements from one part of the DOM and
  * copying them to another part of the DOM, while maintaining their connection to the original AngularJS
  * scope from where they were taken.
  *
@@ -602,8 +624,8 @@
       }]);
     </script>
     <div ng-controller="GreeterController">
-      <input ng-model="name"> <br>
-      <textarea ng-model="html"></textarea> <br>
+      <input ng-model="name"> <br/>
+      <textarea ng-model="html"></textarea> <br/>
       <div compile="html"></div>
     </div>
    </file>
@@ -625,7 +647,7 @@
  * @param {string|DOMElement} element Element or HTML string to compile into a template function.
  * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED.
  *
- * <div class="alert alert-error">
+ * <div class="alert alert-danger">
  * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it
  *   e.g. will not use the right outer scope. Please pass the transclude function as a
  *   `parentBoundTranscludeFn` to the link function instead.
@@ -640,7 +662,7 @@
  *  * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the
  *  `template` and call the `cloneAttachFn` function allowing the caller to attach the
  *  cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is
- *  called as: <br> `cloneAttachFn(clonedElement, scope)` where:
+ *  called as: <br/> `cloneAttachFn(clonedElement, scope)` where:
  *
  *      * `clonedElement` - is a clone of the original `element` passed into the compiler.
  *      * `scope` - is the current scope with which the linking function is working with.
@@ -778,6 +800,18 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
     return bindings;
   }
 
+  function assertValidDirectiveName(name) {
+    var letter = name.charAt(0);
+    if (!letter || letter !== lowercase(letter)) {
+      throw $compileMinErr('baddir', "Directive name '{0}' is invalid. The first character must be a lowercase letter", name);
+    }
+    if (name !== name.trim()) {
+      throw $compileMinErr('baddir',
+            "Directive name '{0}' is invalid. The name should not contain leading or trailing whitespaces",
+            name);
+    }
+  }
+
   /**
    * @ngdoc method
    * @name $compileProvider#directive
@@ -796,6 +830,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
    this.directive = function registerDirective(name, directiveFactory) {
     assertNotHasOwnProperty(name, 'directive');
     if (isString(name)) {
+      assertValidDirectiveName(name);
       assertArg(directiveFactory, 'directiveFactory');
       if (!hasDirectives.hasOwnProperty(name)) {
         hasDirectives[name] = [];
@@ -820,6 +855,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                 if (isObject(bindings.isolateScope)) {
                   directive.$$isolateBindings = bindings.isolateScope;
                 }
+                directive.$$moduleName = directiveFactory.$$moduleName;
                 directives.push(directive);
               } catch (e) {
                 $exceptionHandler(e);
@@ -1152,7 +1188,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
         listeners.push(fn);
         $rootScope.$evalAsync(function() {
-          if (!listeners.$$inter && attrs.hasOwnProperty(key)) {
+          if (!listeners.$$inter && attrs.hasOwnProperty(key) && !isUndefined(attrs[key])) {
             // no one registered attribute interpolation function, so lets call it manually
             fn(attrs[key]);
           }
@@ -1391,8 +1427,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
             if (nodeLinkFn.transcludeOnThisElement) {
               childBoundTranscludeFn = createBoundTranscludeFn(
-                  scope, nodeLinkFn.transclude, parentBoundTranscludeFn,
-                  nodeLinkFn.elementTranscludeOnThisElement);
+                  scope, nodeLinkFn.transclude, parentBoundTranscludeFn);
 
             } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) {
               childBoundTranscludeFn = parentBoundTranscludeFn;
@@ -1414,7 +1449,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       }
     }
 
-    function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn, elementTransclusion) {
+    function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) {
 
       var boundTranscludeFn = function(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) {
 
@@ -1513,6 +1548,13 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           }
           break;
         case NODE_TYPE_TEXT: /* Text Node */
+          if (msie === 11) {
+            // Workaround for #11781
+            while (node.parentNode && node.nextSibling && node.nextSibling.nodeType === NODE_TYPE_TEXT) {
+              node.nodeValue = node.nodeValue + node.nextSibling.nodeValue;
+              node.parentNode.removeChild(node.nextSibling);
+            }
+          }
           addTextInterpolateDirective(directives, node.nodeValue);
           break;
         case NODE_TYPE_COMMENT: /* Comment */
@@ -1612,9 +1654,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       previousCompileContext = previousCompileContext || {};
 
       var terminalPriority = -Number.MAX_VALUE,
-          newScopeDirective,
+          newScopeDirective = previousCompileContext.newScopeDirective,
           controllerDirectives = previousCompileContext.controllerDirectives,
-          controllers,
           newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
           templateDirective = previousCompileContext.templateDirective,
           nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
@@ -1672,7 +1713,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
         if (!directive.templateUrl && directive.controller) {
           directiveValue = directive.controller;
-          controllerDirectives = controllerDirectives || {};
+          controllerDirectives = controllerDirectives || createMap();
           assertNoDuplicate("'" + directiveName + "' controller",
               controllerDirectives[directiveName], directive, $compileNode);
           controllerDirectives[directiveName] = directive;
@@ -1779,6 +1820,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode,
               templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, {
                 controllerDirectives: controllerDirectives,
+                newScopeDirective: (newScopeDirective !== directive) && newScopeDirective,
                 newIsolateScopeDirective: newIsolateScopeDirective,
                 templateDirective: templateDirective,
                 nonTlbTranscludeDirective: nonTlbTranscludeDirective
@@ -1806,7 +1848,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
       nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
       nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective;
-      nodeLinkFn.elementTranscludeOnThisElement = hasElementTranscludeDirective;
       nodeLinkFn.templateOnThisElement = hasTemplate;
       nodeLinkFn.transclude = childTranscludeFn;
 
@@ -1840,51 +1881,74 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
 
       function getControllers(directiveName, require, $element, elementControllers) {
-        var value, retrievalMethod = 'data', optional = false;
-        var $searchElement = $element;
-        var match;
-        if (isString(require)) {
-          match = require.match(REQUIRE_PREFIX_REGEXP);
-          require = require.substring(match[0].length);
+        var value;
 
-          if (match[3]) {
-            if (match[1]) match[3] = null;
-            else match[1] = match[3];
-          }
-          if (match[1] === '^') {
-            retrievalMethod = 'inheritedData';
-          } else if (match[1] === '^^') {
-            retrievalMethod = 'inheritedData';
-            $searchElement = $element.parent();
-          }
-          if (match[2] === '?') {
-            optional = true;
+        if (isString(require)) {
+          var match = require.match(REQUIRE_PREFIX_REGEXP);
+          var name = require.substring(match[0].length);
+          var inheritType = match[1] || match[3];
+          var optional = match[2] === '?';
+
+          //If only parents then start at the parent element
+          if (inheritType === '^^') {
+            $element = $element.parent();
+          //Otherwise attempt getting the controller from elementControllers in case
+          //the element is transcluded (and has no data) and to avoid .data if possible
+          } else {
+            value = elementControllers && elementControllers[name];
+            value = value && value.instance;
           }
 
-          value = null;
-
-          if (elementControllers && retrievalMethod === 'data') {
-            if (value = elementControllers[require]) {
-              value = value.instance;
-            }
+          if (!value) {
+            var dataName = '$' + name + 'Controller';
+            value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
           }
-          value = value || $searchElement[retrievalMethod]('$' + require + 'Controller');
 
           if (!value && !optional) {
             throw $compileMinErr('ctreq',
                 "Controller '{0}', required by directive '{1}', can't be found!",
-                require, directiveName);
+                name, directiveName);
           }
-          return value || null;
         } else if (isArray(require)) {
           value = [];
-          forEach(require, function(require) {
-            value.push(getControllers(directiveName, require, $element, elementControllers));
-          });
+          for (var i = 0, ii = require.length; i < ii; i++) {
+            value[i] = getControllers(directiveName, require[i], $element, elementControllers);
+          }
         }
-        return value;
+
+        return value || null;
       }
 
+      function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope) {
+        var elementControllers = createMap();
+        for (var controllerKey in controllerDirectives) {
+          var directive = controllerDirectives[controllerKey];
+          var locals = {
+            $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
+            $element: $element,
+            $attrs: attrs,
+            $transclude: transcludeFn
+          };
+
+          var controller = directive.controller;
+          if (controller == '@') {
+            controller = attrs[directive.name];
+          }
+
+          var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
+
+          // For directives with element transclusion the element is a comment,
+          // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
+          // clean up (http://bugs.jquery.com/ticket/8335).
+          // Instead, we save the controllers for the element in a local hash and attach to .data
+          // later, once we have the actual element.
+          elementControllers[directive.name] = controllerInstance;
+          if (!hasElementTranscludeDirective) {
+            $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
+          }
+        }
+        return elementControllers;
+      }
 
       function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn,
                           thisLinkFn) {
@@ -1911,36 +1975,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         }
 
         if (controllerDirectives) {
-          // TODO: merge `controllers` and `elementControllers` into single object.
-          controllers = {};
-          elementControllers = {};
-          forEach(controllerDirectives, function(directive) {
-            var locals = {
-              $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
-              $element: $element,
-              $attrs: attrs,
-              $transclude: transcludeFn
-            }, controllerInstance;
-
-            controller = directive.controller;
-            if (controller == '@') {
-              controller = attrs[directive.name];
-            }
-
-            controllerInstance = $controller(controller, locals, true, directive.controllerAs);
-
-            // For directives with element transclusion the element is a comment,
-            // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
-            // clean up (http://bugs.jquery.com/ticket/8335).
-            // Instead, we save the controllers for the element in a local hash and attach to .data
-            // later, once we have the actual element.
-            elementControllers[directive.name] = controllerInstance;
-            if (!hasElementTranscludeDirective) {
-              $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
-            }
-
-            controllers[directive.name] = controllerInstance;
-          });
+          elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope);
         }
 
         if (newIsolateScopeDirective) {
@@ -1954,14 +1989,14 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                                       isolateScope.$$isolateBindings,
                                       newIsolateScopeDirective, isolateScope);
         }
-        if (controllers) {
+        if (elementControllers) {
           // Initialize bindToController bindings for new/isolate scopes
           var scopeDirective = newIsolateScopeDirective || newScopeDirective;
           var bindings;
           var controllerForBindings;
-          if (scopeDirective && controllers[scopeDirective.name]) {
+          if (scopeDirective && elementControllers[scopeDirective.name]) {
             bindings = scopeDirective.$$bindings.bindToController;
-            controller = controllers[scopeDirective.name];
+            controller = elementControllers[scopeDirective.name];
 
             if (controller && controller.identifier && bindings) {
               controllerForBindings = controller;
@@ -1970,18 +2005,23 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                                               bindings, scopeDirective);
             }
           }
-          forEach(controllers, function(controller) {
-            var result = controller();
-            if (result !== controller.instance &&
-                controller === controllerForBindings) {
-              // Remove and re-install bindToController bindings
-              thisLinkFn.$$destroyBindings();
-              thisLinkFn.$$destroyBindings =
-                  initializeDirectiveBindings(scope, attrs, result,
-                                              bindings, scopeDirective);
+          for (i in elementControllers) {
+            controller = elementControllers[i];
+            var controllerResult = controller();
+
+            if (controllerResult !== controller.instance) {
+              // If the controller constructor has a return value, overwrite the instance
+              // from setupControllers and update the element data
+              controller.instance = controllerResult;
+              $element.data('$' + i + 'Controller', controllerResult);
+              if (controller === controllerForBindings) {
+                // Remove and re-install bindToController bindings
+                thisLinkFn.$$destroyBindings();
+                thisLinkFn.$$destroyBindings =
+                  initializeDirectiveBindings(scope, attrs, controllerResult, bindings, scopeDirective);
+              }
             }
-          });
-          controllers = null;
+          }
         }
 
         // PRELINKING
@@ -2165,7 +2205,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
       $compileNode.empty();
 
-      $templateRequest($sce.getTrustedResourceUrl(templateUrl))
+      $templateRequest(templateUrl)
         .then(function(content) {
           var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn;
 
@@ -2273,11 +2313,18 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       return a.index - b.index;
     }
 
-
     function assertNoDuplicate(what, previousDirective, directive, element) {
+
+      function wrapModuleNameIfDefined(moduleName) {
+        return moduleName ?
+          (' (module: ' + moduleName + ')') :
+          '';
+      }
+
       if (previousDirective) {
-        throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}',
-            previousDirective.name, directive.name, what, startingTag(element));
+        throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}',
+            previousDirective.name, wrapModuleNameIfDefined(previousDirective.$$moduleName),
+            directive.name, wrapModuleNameIfDefined(directive.$$moduleName), what, startingTag(element));
       }
     }
 
@@ -2458,26 +2505,28 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       var fragment = document.createDocumentFragment();
       fragment.appendChild(firstElementToRemove);
 
-      // Copy over user data (that includes Angular's $scope etc.). Don't copy private
-      // data here because there's no public interface in jQuery to do that and copying over
-      // event listeners (which is the main use of private data) wouldn't work anyway.
-      jqLite(newNode).data(jqLite(firstElementToRemove).data());
-
-      // Remove data of the replaced element. We cannot just call .remove()
-      // on the element it since that would deallocate scope that is needed
-      // for the new node. Instead, remove the data "manually".
-      if (!jQuery) {
-        delete jqLite.cache[firstElementToRemove[jqLite.expando]];
-      } else {
-        // jQuery 2.x doesn't expose the data storage. Use jQuery.cleanData to clean up after
-        // the replaced element. The cleanData version monkey-patched by Angular would cause
-        // the scope to be trashed and we do need the very same scope to work with the new
-        // element. However, we cannot just cache the non-patched version and use it here as
-        // that would break if another library patches the method after Angular does (one
-        // example is jQuery UI). Instead, set a flag indicating scope destroying should be
-        // skipped this one time.
-        skipDestroyOnNextJQueryCleanData = true;
-        jQuery.cleanData([firstElementToRemove]);
+      if (jqLite.hasData(firstElementToRemove)) {
+        // Copy over user data (that includes Angular's $scope etc.). Don't copy private
+        // data here because there's no public interface in jQuery to do that and copying over
+        // event listeners (which is the main use of private data) wouldn't work anyway.
+        jqLite(newNode).data(jqLite(firstElementToRemove).data());
+
+        // Remove data of the replaced element. We cannot just call .remove()
+        // on the element it since that would deallocate scope that is needed
+        // for the new node. Instead, remove the data "manually".
+        if (!jQuery) {
+          delete jqLite.cache[firstElementToRemove[jqLite.expando]];
+        } else {
+          // jQuery 2.x doesn't expose the data storage. Use jQuery.cleanData to clean up after
+          // the replaced element. The cleanData version monkey-patched by Angular would cause
+          // the scope to be trashed and we do need the very same scope to work with the new
+          // element. However, we cannot just cache the non-patched version and use it here as
+          // that would break if another library patches the method after Angular does (one
+          // example is jQuery UI). Instead, set a flag indicating scope destroying should be
+          // skipped this one time.
+          skipDestroyOnNextJQueryCleanData = true;
+          jQuery.cleanData([firstElementToRemove]);
+        }
       }
 
       for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
@@ -2521,11 +2570,16 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         switch (mode) {
 
           case '@':
+            if (!optional && !hasOwnProperty.call(attrs, attrName)) {
+              destination[scopeName] = attrs[attrName] = void 0;
+            }
             attrs.$observe(attrName, function(value) {
-              destination[scopeName] = value;
+              if (isString(value)) {
+                destination[scopeName] = value;
+              }
             });
             attrs.$$observers[attrName].$$scope = scope;
-            if (attrs[attrName]) {
+            if (isString(attrs[attrName])) {
               // If the attribute has been provided then we trigger an interpolation to ensure
               // the value is there for use in the link fn
               destination[scopeName] = $interpolate(attrs[attrName])(scope);
@@ -2533,9 +2587,12 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
             break;
 
           case '=':
-            if (optional && !attrs[attrName]) {
-              return;
+            if (!hasOwnProperty.call(attrs, attrName)) {
+              if (optional) break;
+              attrs[attrName] = void 0;
             }
+            if (optional && !attrs[attrName]) break;
+
             parentGet = $parse(attrs[attrName]);
             if (parentGet.literal) {
               compare = equals;
@@ -2576,9 +2633,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
           case '&':
             // Don't assign Object.prototype method to scope
-            if (!attrs.hasOwnProperty(attrName) && optional) break;
-
-            parentGet = $parse(attrs[attrName]);
+            parentGet = attrs.hasOwnProperty(attrName) ? $parse(attrs[attrName]) : noop;
 
             // Don't assign noop to destination if expression is not valid
             if (parentGet === noop && optional) break;
diff --git a/src/ng/cookieReader.js b/src/ng/cookieReader.js
new file mode 100644
index 000000000000..b22d96096893
--- /dev/null
+++ b/src/ng/cookieReader.js
@@ -0,0 +1,56 @@
+'use strict';
+
+/**
+ * @name $$cookieReader
+ * @requires $document
+ *
+ * @description
+ * This is a private service for reading cookies used by $http and ngCookies
+ *
+ * @return {Object} a key/value map of the current cookies
+ */
+function $$CookieReader($document) {
+  var rawDocument = $document[0] || {};
+  var lastCookies = {};
+  var lastCookieString = '';
+
+  function safeDecodeURIComponent(str) {
+    try {
+      return decodeURIComponent(str);
+    } catch (e) {
+      return str;
+    }
+  }
+
+  return function() {
+    var cookieArray, cookie, i, index, name;
+    var currentCookieString = rawDocument.cookie || '';
+
+    if (currentCookieString !== lastCookieString) {
+      lastCookieString = currentCookieString;
+      cookieArray = lastCookieString.split('; ');
+      lastCookies = {};
+
+      for (i = 0; i < cookieArray.length; i++) {
+        cookie = cookieArray[i];
+        index = cookie.indexOf('=');
+        if (index > 0) { //ignore nameless cookies
+          name = safeDecodeURIComponent(cookie.substring(0, index));
+          // the first value that is seen for a cookie is the most
+          // specific one.  values for the same cookie name that
+          // follow are for less specific paths.
+          if (lastCookies[name] === undefined) {
+            lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1));
+          }
+        }
+      }
+    }
+    return lastCookies;
+  };
+}
+
+$$CookieReader.$inject = ['$document'];
+
+function $$CookieReaderProvider() {
+  this.$get = $$CookieReader;
+}
diff --git a/src/ng/directive/attrs.js b/src/ng/directive/attrs.js
index 520a311e9f0c..a75fd9d42073 100644
--- a/src/ng/directive/attrs.js
+++ b/src/ng/directive/attrs.js
@@ -113,12 +113,12 @@
  *
  * The buggy way to write it:
  * ```html
- * <img src="http://www.gravatar.com/avatar/{{hash}}"/>
+ * <img src="http://www.gravatar.com/avatar/{{hash}}" alt="Description"/>
  * ```
  *
  * The correct way to write it:
  * ```html
- * <img ng-src="http://www.gravatar.com/avatar/{{hash}}"/>
+ * <img ng-src="http://www.gravatar.com/avatar/{{hash}}" alt="Description" />
  * ```
  *
  * @element IMG
@@ -139,12 +139,12 @@
  *
  * The buggy way to write it:
  * ```html
- * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
+ * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description"/>
  * ```
  *
  * The correct way to write it:
  * ```html
- * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
+ * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description" />
  * ```
  *
  * @element IMG
@@ -159,25 +159,29 @@
  *
  * @description
  *
- * We shouldn't do this, because it will make the button enabled on Chrome/Firefox but not on IE8 and older IEs:
+ * This directive sets the `disabled` attribute on the element if the
+ * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy.
+ *
+ * A special directive is necessary because we cannot use interpolation inside the `disabled`
+ * attribute.  The following example would make the button enabled on Chrome/Firefox
+ * but not on older IEs:
+ *
  * ```html
- * <div ng-init="scope = { isDisabled: false }">
- *  <button disabled="{{scope.isDisabled}}">Disabled</button>
+ * <!-- See below for an example of ng-disabled being used correctly -->
+ * <div ng-init="isDisabled = false">
+ *  <button disabled="{{isDisabled}}">Disabled</button>
  * </div>
  * ```
  *
- * The HTML specification does not require browsers to preserve the values of boolean attributes
- * such as disabled. (Their presence means true and their absence means false.)
+ * This is because the HTML specification does not require browsers to preserve the values of
+ * boolean attributes such as `disabled` (Their presence means true and their absence means false.)
  * If we put an Angular interpolation expression into such an attribute then the
  * binding information would be lost when the browser removes the attribute.
- * The `ngDisabled` directive solves this problem for the `disabled` attribute.
- * This complementary directive is not removed by the browser and so provides
- * a permanent reliable place to store the binding information.
  *
  * @example
     <example>
       <file name="index.html">
-        Click me to toggle: <input type="checkbox" ng-model="checked"><br/>
+        <label>Click me to toggle: <input type="checkbox" ng-model="checked"></label><br/>
         <button ng-model="button" ng-disabled="checked">Button</button>
       </file>
       <file name="protractor.js" type="protractor">
@@ -191,7 +195,7 @@
  *
  * @element INPUT
  * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
- *     then special attribute "disabled" will be set on the element
+ *     then the `disabled` attribute will be set on the element
  */
 
 
@@ -202,6 +206,13 @@
  * @priority 100
  *
  * @description
+ * Sets the `checked` attribute on the element, if the expression inside `ngChecked` is truthy.
+ *
+ * Note that this directive should not be used together with {@link ngModel `ngModel`},
+ * as this can lead to unexpected behavior.
+ *
+ * ### Why do we need `ngChecked`?
+ *
  * The HTML specification does not require browsers to preserve the values of boolean attributes
  * such as checked. (Their presence means true and their absence means false.)
  * If we put an Angular interpolation expression into such an attribute then the
@@ -212,8 +223,8 @@
  * @example
     <example>
       <file name="index.html">
-        Check me to check both: <input type="checkbox" ng-model="master"><br/>
-        <input id="checkSlave" type="checkbox" ng-checked="master">
+        <label>Check me to check both: <input type="checkbox" ng-model="master"></label><br/>
+        <input id="checkSlave" type="checkbox" ng-checked="master" aria-label="Slave input">
       </file>
       <file name="protractor.js" type="protractor">
         it('should check both checkBoxes', function() {
@@ -226,7 +237,7 @@
  *
  * @element INPUT
  * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
- *     then special attribute "checked" will be set on the element
+ *     then the `checked` attribute will be set on the element
  */
 
 
@@ -247,8 +258,8 @@
  * @example
     <example>
       <file name="index.html">
-        Check me to make text readonly: <input type="checkbox" ng-model="checked"><br/>
-        <input type="text" ng-readonly="checked" value="I'm Angular"/>
+        <label>Check me to make text readonly: <input type="checkbox" ng-model="checked"></label><br/>
+        <input type="text" ng-readonly="checked" value="I'm Angular" aria-label="Readonly field" />
       </file>
       <file name="protractor.js" type="protractor">
         it('should toggle readonly attr', function() {
@@ -283,8 +294,8 @@
  * @example
     <example>
       <file name="index.html">
-        Check me to select: <input type="checkbox" ng-model="selected"><br/>
-        <select>
+        <label>Check me to select: <input type="checkbox" ng-model="selected"></label><br/>
+        <select aria-label="ngSelected demo">
           <option>Hello!</option>
           <option id="greet" ng-selected="selected">Greetings!</option>
         </select>
@@ -320,7 +331,7 @@
  * @example
      <example>
        <file name="index.html">
-         Check me check multiple: <input type="checkbox" ng-model="open"><br/>
+         <label>Check me check multiple: <input type="checkbox" ng-model="open"></label><br/>
          <details id="details" ng-open="open">
             <summary>Show/Hide me</summary>
          </details>
diff --git a/src/ng/directive/form.js b/src/ng/directive/form.js
index 3041b3fc93fd..d540e0403953 100644
--- a/src/ng/directive/form.js
+++ b/src/ng/directive/form.js
@@ -316,7 +316,7 @@ function FormController(element, attrs, $scope, $animate, $interpolate) {
  *
  * # Alias: {@link ng.directive:ngForm `ngForm`}
  *
- * In Angular forms can be nested. This means that the outer form is valid when all of the child
+ * In Angular, forms can be nested. This means that the outer form is valid when all of the child
  * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
  * Angular provides the {@link ng.directive:ngForm `ngForm`} directive which behaves identically to
  * `<form>` but can be nested.  This allows you to have nested forms, which is very useful when
@@ -415,11 +415,11 @@ function FormController(element, attrs, $scope, $animate, $interpolate) {
        <form name="myForm" ng-controller="FormController" class="my-form">
          userType: <input name="input" ng-model="userType" required>
          <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
-         <tt>userType = {{userType}}</tt><br>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
+         <code>userType = {{userType}}</code><br>
+         <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br>
+         <code>myForm.input.$error = {{myForm.input.$error}}</code><br>
+         <code>myForm.$valid = {{myForm.$valid}}</code><br>
+         <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br>
         </form>
       </file>
       <file name="protractor.js" type="protractor">
@@ -449,15 +449,17 @@ function FormController(element, attrs, $scope, $animate, $interpolate) {
  *                       related scope, under this name.
  */
 var formDirectiveFactory = function(isNgForm) {
-  return ['$timeout', function($timeout) {
+  return ['$timeout', '$parse', function($timeout, $parse) {
     var formDirective = {
       name: 'form',
       restrict: isNgForm ? 'EAC' : 'E',
       controller: FormController,
-      compile: function ngFormCompile(formElement) {
+      compile: function ngFormCompile(formElement, attr) {
         // Setup initial state of the control
         formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
 
+        var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
+
         return {
           pre: function ngFormPreLink(scope, formElement, attr, controller) {
             // if `action` attr is not present on the form, prevent the default action (submission)
@@ -488,24 +490,22 @@ var formDirectiveFactory = function(isNgForm) {
               });
             }
 
-            var parentFormCtrl = controller.$$parentForm,
-                alias = controller.$name;
-
-            if (alias) {
-              setter(scope, alias, controller, alias);
-              attr.$observe(attr.name ? 'name' : 'ngForm', function(newValue) {
-                if (alias === newValue) return;
-                setter(scope, alias, undefined, alias);
-                alias = newValue;
-                setter(scope, alias, controller, alias);
-                parentFormCtrl.$$renameControl(controller, alias);
+            var parentFormCtrl = controller.$$parentForm;
+            var setter = nameAttr ? getSetter(controller.$name) : noop;
+
+            if (nameAttr) {
+              setter(scope, controller);
+              attr.$observe(nameAttr, function(newValue) {
+                if (controller.$name === newValue) return;
+                setter(scope, undefined);
+                parentFormCtrl.$$renameControl(controller, newValue);
+                setter = getSetter(controller.$name);
+                setter(scope, controller);
               });
             }
             formElement.on('$destroy', function() {
               parentFormCtrl.$removeControl(controller);
-              if (alias) {
-                setter(scope, alias, undefined, alias);
-              }
+              setter(scope, undefined);
               extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
             });
           }
@@ -514,6 +514,14 @@ var formDirectiveFactory = function(isNgForm) {
     };
 
     return formDirective;
+
+    function getSetter(expression) {
+      if (expression === '') {
+        //create an assignable expression, so forms with an empty name can be renamed later
+        return $parse('this[""]').assign;
+      }
+      return $parse(expression).assign || noop;
+    }
   }];
 };
 
diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js
index eb58f295a7eb..a8843ccdc83a 100644
--- a/src/ng/directive/input.js
+++ b/src/ng/directive/input.js
@@ -13,7 +13,7 @@
 var ISO_DATE_REGEXP = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/;
 var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
 var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
-var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
+var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
 var DATE_REGEXP = /^(\d{4})-(\d{2})-(\d{2})$/;
 var DATETIMELOCAL_REGEXP = /^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
 var WEEK_REGEXP = /^(\d{4})-W(\d\d)$/;
@@ -46,9 +46,13 @@ var inputType = {
    *    as in the ngPattern directive.
    * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
    *    a RegExp found by evaluating the Angular expression given in the attribute value.
-   *    If the expression evaluates to a RegExp object then this is used directly.
-   *    If the expression is a string then it will be converted to a RegExp after wrapping it in `^` and `$`
-   *    characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
    * @param {string=} ngChange Angular expression to be executed when input changes due to user
    *    interaction with the input element.
    * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
@@ -68,13 +72,16 @@ var inputType = {
              }]);
          </script>
          <form name="myForm" ng-controller="ExampleController">
-           Single word: <input type="text" name="input" ng-model="example.text"
-                               ng-pattern="example.word" required ng-trim="false">
-           <span class="error" ng-show="myForm.input.$error.required">
-             Required!</span>
-           <span class="error" ng-show="myForm.input.$error.pattern">
-             Single word only!</span>
-
+           <label>Single word:
+             <input type="text" name="input" ng-model="example.text"
+                    ng-pattern="example.word" required ng-trim="false">
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.pattern">
+               Single word only!</span>
+           </div>
            <tt>text = {{example.text}}</tt><br/>
            <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
            <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -153,13 +160,15 @@ var inputType = {
             }]);
        </script>
        <form name="myForm" ng-controller="DateController as dateCtrl">
-          Pick a date in 2013:
+          <label for="exampleInput">Pick a date in 2013:</label>
           <input type="date" id="exampleInput" name="input" ng-model="example.value"
               placeholder="yyyy-MM-dd" min="2013-01-01" max="2013-12-31" required />
-          <span class="error" ng-show="myForm.input.$error.required">
-              Required!</span>
-          <span class="error" ng-show="myForm.input.$error.date">
-              Not a valid date!</span>
+          <div role="alert">
+            <span class="error" ng-show="myForm.input.$error.required">
+                Required!</span>
+            <span class="error" ng-show="myForm.input.$error.date">
+                Not a valid date!</span>
+           </div>
            <tt>value = {{example.value | date: "yyyy-MM-dd"}}</tt><br/>
            <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
            <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -246,13 +255,15 @@ var inputType = {
           }]);
       </script>
       <form name="myForm" ng-controller="DateController as dateCtrl">
-        Pick a date between in 2013:
+        <label for="exampleInput">Pick a date between in 2013:</label>
         <input type="datetime-local" id="exampleInput" name="input" ng-model="example.value"
             placeholder="yyyy-MM-ddTHH:mm:ss" min="2001-01-01T00:00:00" max="2013-12-31T00:00:00" required />
-        <span class="error" ng-show="myForm.input.$error.required">
-            Required!</span>
-        <span class="error" ng-show="myForm.input.$error.datetimelocal">
-            Not a valid date!</span>
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.datetimelocal">
+              Not a valid date!</span>
+        </div>
         <tt>value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}</tt><br/>
         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -340,13 +351,15 @@ var inputType = {
         }]);
      </script>
      <form name="myForm" ng-controller="DateController as dateCtrl">
-        Pick a between 8am and 5pm:
+        <label for="exampleInput">Pick a between 8am and 5pm:</label>
         <input type="time" id="exampleInput" name="input" ng-model="example.value"
             placeholder="HH:mm:ss" min="08:00:00" max="17:00:00" required />
-        <span class="error" ng-show="myForm.input.$error.required">
-            Required!</span>
-        <span class="error" ng-show="myForm.input.$error.time">
-            Not a valid date!</span>
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.time">
+              Not a valid date!</span>
+        </div>
         <tt>value = {{example.value | date: "HH:mm:ss"}}</tt><br/>
         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -433,13 +446,17 @@ var inputType = {
         }]);
       </script>
       <form name="myForm" ng-controller="DateController as dateCtrl">
-        Pick a date between in 2013:
-        <input id="exampleInput" type="week" name="input" ng-model="example.value"
-            placeholder="YYYY-W##" min="2012-W32" max="2013-W52" required />
-        <span class="error" ng-show="myForm.input.$error.required">
-            Required!</span>
-        <span class="error" ng-show="myForm.input.$error.week">
-            Not a valid date!</span>
+        <label>Pick a date between in 2013:
+          <input id="exampleInput" type="week" name="input" ng-model="example.value"
+                 placeholder="YYYY-W##" min="2012-W32"
+                 max="2013-W52" required />
+        </label>
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.week">
+              Not a valid date!</span>
+        </div>
         <tt>value = {{example.value | date: "yyyy-Www"}}</tt><br/>
         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -526,13 +543,15 @@ var inputType = {
         }]);
      </script>
      <form name="myForm" ng-controller="DateController as dateCtrl">
-       Pick a month in 2013:
+       <label for="exampleInput">Pick a month in 2013:</label>
        <input id="exampleInput" type="month" name="input" ng-model="example.value"
           placeholder="yyyy-MM" min="2013-01" max="2013-12" required />
-       <span class="error" ng-show="myForm.input.$error.required">
-          Required!</span>
-       <span class="error" ng-show="myForm.input.$error.month">
-          Not a valid month!</span>
+       <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+            Required!</span>
+         <span class="error" ng-show="myForm.input.$error.month">
+            Not a valid month!</span>
+       </div>
        <tt>value = {{example.value | date: "yyyy-MM"}}</tt><br/>
        <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
        <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -587,7 +606,21 @@ var inputType = {
    * Text input with number validation and transformation. Sets the `number` validation
    * error if not a valid number.
    *
-   * The model must always be a number, otherwise Angular will throw an error.
+   * <div class="alert alert-warning">
+   * The model must always be of type `number` otherwise Angular will throw an error.
+   * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
+   * error docs for more information and an example of how to convert your model if necessary.
+   * </div>
+   *
+   * ## Issues with HTML5 constraint validation
+   *
+   * In browsers that follow the
+   * [HTML5 specification](https://html.spec.whatwg.org/multipage/forms.html#number-state-%28type=number%29),
+   * `input[number]` does not work as expected with {@link ngModelOptions `ngModelOptions.allowInvalid`}.
+   * If a non-number is entered in the input, the browser will report the value as an empty string,
+   * which means the view / model values in `ngModel` and subsequently the scope value
+   * will also be an empty string.
+   *
    *
    * @param {string} ngModel Assignable angular expression to data-bind to.
    * @param {string=} name Property name of the form under which the control is published.
@@ -607,9 +640,13 @@ var inputType = {
    *    as in the ngPattern directive.
    * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
    *    a RegExp found by evaluating the Angular expression given in the attribute value.
-   *    If the expression evaluates to a RegExp object then this is used directly.
-   *    If the expression is a string then it will be converted to a RegExp after wrapping it in `^` and `$`
-   *    characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
    * @param {string=} ngChange Angular expression to be executed when input changes due to user
    *    interaction with the input element.
    *
@@ -625,12 +662,16 @@ var inputType = {
              }]);
          </script>
          <form name="myForm" ng-controller="ExampleController">
-           Number: <input type="number" name="input" ng-model="example.value"
-                          min="0" max="99" required>
-           <span class="error" ng-show="myForm.input.$error.required">
-             Required!</span>
-           <span class="error" ng-show="myForm.input.$error.number">
-             Not valid number!</span>
+           <label>Number:
+             <input type="number" name="input" ng-model="example.value"
+                    min="0" max="99" required>
+          </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.number">
+               Not valid number!</span>
+           </div>
            <tt>value = {{example.value}}</tt><br/>
            <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
            <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -697,9 +738,13 @@ var inputType = {
    *    as in the ngPattern directive.
    * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
    *    a RegExp found by evaluating the Angular expression given in the attribute value.
-   *    If the expression evaluates to a RegExp object then this is used directly.
-   *    If the expression is a string then it will be converted to a RegExp after wrapping it in `^` and `$`
-   *    characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
    * @param {string=} ngChange Angular expression to be executed when input changes due to user
    *    interaction with the input element.
    *
@@ -715,11 +760,15 @@ var inputType = {
              }]);
          </script>
          <form name="myForm" ng-controller="ExampleController">
-           URL: <input type="url" name="input" ng-model="url.text" required>
-           <span class="error" ng-show="myForm.input.$error.required">
-             Required!</span>
-           <span class="error" ng-show="myForm.input.$error.url">
-             Not valid url!</span>
+           <label>URL:
+             <input type="url" name="input" ng-model="url.text" required>
+           <label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.url">
+               Not valid url!</span>
+           </div>
            <tt>text = {{url.text}}</tt><br/>
            <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
            <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -788,9 +837,13 @@ var inputType = {
    *    as in the ngPattern directive.
    * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
    *    a RegExp found by evaluating the Angular expression given in the attribute value.
-   *    If the expression evaluates to a RegExp object then this is used directly.
-   *    If the expression is a string then it will be converted to a RegExp after wrapping it in `^` and `$`
-   *    characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
    * @param {string=} ngChange Angular expression to be executed when input changes due to user
    *    interaction with the input element.
    *
@@ -806,11 +859,15 @@ var inputType = {
              }]);
          </script>
            <form name="myForm" ng-controller="ExampleController">
-             Email: <input type="email" name="input" ng-model="email.text" required>
-             <span class="error" ng-show="myForm.input.$error.required">
-               Required!</span>
-             <span class="error" ng-show="myForm.input.$error.email">
-               Not valid email!</span>
+             <label>Email:
+               <input type="email" name="input" ng-model="email.text" required>
+             </label>
+             <div role="alert">
+               <span class="error" ng-show="myForm.input.$error.required">
+                 Required!</span>
+               <span class="error" ng-show="myForm.input.$error.email">
+                 Not valid email!</span>
+             </div>
              <tt>text = {{email.text}}</tt><br/>
              <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
              <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
@@ -856,12 +913,15 @@ var inputType = {
    * HTML radio button.
    *
    * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string} value The value to which the expression should be set when selected.
+   * @param {string} value The value to which the `ngModel` expression should be set when selected.
+   *    Note that `value` only supports `string` values, i.e. the scope model needs to be a string,
+   *    too. Use `ngValue` if you need complex models (`number`, `object`, ...).
    * @param {string=} name Property name of the form under which the control is published.
    * @param {string=} ngChange Angular expression to be executed when input changes due to user
    *    interaction with the input element.
-   * @param {string} ngValue Angular expression which sets the value to which the expression should
-   *    be set when selected.
+   * @param {string} ngValue Angular expression to which `ngModel` will be be set when the radio
+   *    is selected. Should be used instead of the `value` attribute if you need
+   *    a non-string `ngModel` (`boolean`, `array`, ...).
    *
    * @example
       <example name="radio-input-directive" module="radioExample">
@@ -879,9 +939,18 @@ var inputType = {
              }]);
          </script>
          <form name="myForm" ng-controller="ExampleController">
-           <input type="radio" ng-model="color.name" value="red">  Red <br/>
-           <input type="radio" ng-model="color.name" ng-value="specialValue"> Green <br/>
-           <input type="radio" ng-model="color.name" value="blue"> Blue <br/>
+           <label>
+             <input type="radio" ng-model="color.name" value="red">
+             Red
+           </label><br/>
+           <label>
+             <input type="radio" ng-model="color.name" ng-value="specialValue">
+             Green
+           </label><br/>
+           <label>
+             <input type="radio" ng-model="color.name" value="blue">
+             Blue
+           </label><br/>
            <tt>color = {{color.name | json}}</tt><br/>
           </form>
           Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
@@ -929,9 +998,13 @@ var inputType = {
              }]);
          </script>
          <form name="myForm" ng-controller="ExampleController">
-           Value1: <input type="checkbox" ng-model="checkboxModel.value1"> <br/>
-           Value2: <input type="checkbox" ng-model="checkboxModel.value2"
-                          ng-true-value="'YES'" ng-false-value="'NO'"> <br/>
+           <label>Value1:
+             <input type="checkbox" ng-model="checkboxModel.value1">
+           </label><br/>
+           <label>Value2:
+             <input type="checkbox" ng-model="checkboxModel.value2"
+                    ng-true-value="'YES'" ng-false-value="'NO'">
+            </label><br/>
            <tt>value1 = {{checkboxModel.value1}}</tt><br/>
            <tt>value2 = {{checkboxModel.value2}}</tt><br/>
           </form>
@@ -1055,7 +1128,11 @@ function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
   element.on('change', listener);
 
   ctrl.$render = function() {
-    element.val(ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue);
+    // Workaround for Firefox validation #12102.
+    var value = ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue;
+    if (element.val() !== value) {
+      element.val(value);
+    }
   };
 }
 
@@ -1156,8 +1233,8 @@ function createDateInputType(type, regexp, parseDate, format) {
         // parser/formatter in the processing chain so that the model
         // contains some different data format!
         var parsedDate = parseDate(value, previousDate);
-        if (timezone === 'UTC') {
-          parsedDate.setMinutes(parsedDate.getMinutes() - parsedDate.getTimezoneOffset());
+        if (timezone) {
+          parsedDate = convertTimezoneToLocal(parsedDate, timezone);
         }
         return parsedDate;
       }
@@ -1170,9 +1247,8 @@ function createDateInputType(type, regexp, parseDate, format) {
       }
       if (isValidDate(value)) {
         previousDate = value;
-        if (previousDate && timezone === 'UTC') {
-          var timezoneOffset = 60000 * previousDate.getTimezoneOffset();
-          previousDate = new Date(previousDate.getTime() + timezoneOffset);
+        if (previousDate && timezone) {
+          previousDate = convertTimezoneToLocal(previousDate, timezone, true);
         }
         return $filter('date')(value, format, timezone);
       } else {
@@ -1396,9 +1472,15 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
  * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
  *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
  *    length.
- * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
- *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
- *    patterns defined as scope expressions.
+ * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+ *    a RegExp found by evaluating the Angular expression given in the attribute value.
+ *    If the expression evaluates to a RegExp object, then this is used directly.
+ *    If the expression evaluates to a string, then it will be converted to a RegExp
+ *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+ *    `new RegExp('^abc$')`.<br />
+ *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+ *    start at the index of the last search's match, thus not taking the whole input value into
+ *    account.
  * @param {string=} ngChange Angular expression to be executed when input changes due to user
  *    interaction with the input element.
  * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
@@ -1429,9 +1511,15 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
  * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
  *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
  *    length.
- * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
- *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
- *    patterns defined as scope expressions.
+ * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+ *    a RegExp found by evaluating the Angular expression given in the attribute value.
+ *    If the expression evaluates to a RegExp object, then this is used directly.
+ *    If the expression evaluates to a string, then it will be converted to a RegExp
+ *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+ *    `new RegExp('^abc$')`.<br />
+ *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+ *    start at the index of the last search's match, thus not taking the whole input value into
+ *    account.
  * @param {string=} ngChange Angular expression to be executed when input changes due to user
  *    interaction with the input element.
  * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
@@ -1449,26 +1537,36 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
        </script>
        <div ng-controller="ExampleController">
          <form name="myForm">
-           User name: <input type="text" name="userName" ng-model="user.name" required>
-           <span class="error" ng-show="myForm.userName.$error.required">
-             Required!</span><br>
-           Last name: <input type="text" name="lastName" ng-model="user.last"
-             ng-minlength="3" ng-maxlength="10">
-           <span class="error" ng-show="myForm.lastName.$error.minlength">
-             Too short!</span>
-           <span class="error" ng-show="myForm.lastName.$error.maxlength">
-             Too long!</span><br>
+           <label>
+              User name:
+              <input type="text" name="userName" ng-model="user.name" required>
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.userName.$error.required">
+              Required!</span>
+           </div>
+           <label>
+              Last name:
+              <input type="text" name="lastName" ng-model="user.last"
+              ng-minlength="3" ng-maxlength="10">
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.lastName.$error.minlength">
+               Too short!</span>
+             <span class="error" ng-show="myForm.lastName.$error.maxlength">
+               Too long!</span>
+           </div>
          </form>
          <hr>
          <tt>user = {{user}}</tt><br/>
-         <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br>
-         <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br>
-         <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br>
-         <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
-         <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br>
-         <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br>
+         <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br/>
+         <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br/>
+         <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br/>
+         <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br/>
+         <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br/>
        </div>
       </file>
       <file name="protractor.js" type="protractor">
diff --git a/src/ng/directive/ngBind.js b/src/ng/directive/ngBind.js
index 8f47eacfead0..37660a75ba52 100644
--- a/src/ng/directive/ngBind.js
+++ b/src/ng/directive/ngBind.js
@@ -35,7 +35,7 @@
            }]);
        </script>
        <div ng-controller="ExampleController">
-         Enter name: <input type="text" ng-model="name"><br>
+         <label>Enter name: <input type="text" ng-model="name"></label><br>
          Hello <span ng-bind="name"></span>!
        </div>
      </file>
@@ -96,8 +96,8 @@ var ngBindDirective = ['$compile', function($compile) {
            }]);
        </script>
        <div ng-controller="ExampleController">
-        Salutation: <input type="text" ng-model="salutation"><br>
-        Name: <input type="text" ng-model="name"><br>
+        <label>Salutation: <input type="text" ng-model="salutation"></label><br>
+        <label>Name: <input type="text" ng-model="name"></label><br>
         <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
        </div>
      </file>
diff --git a/src/ng/directive/ngClass.js b/src/ng/directive/ngClass.js
index d96169042f7c..b165995032f7 100644
--- a/src/ng/directive/ngClass.js
+++ b/src/ng/directive/ngClass.js
@@ -39,7 +39,9 @@ function classDirective(name, selector) {
         }
 
         function digestClassCounts(classes, count) {
-          var classCounts = element.data('$classCounts') || {};
+          // Use createMap() to prevent class assumptions involving property
+          // names in Object.prototype
+          var classCounts = element.data('$classCounts') || createMap();
           var classesToUpdate = [];
           forEach(classes, function(className) {
             if (count > 0 || classCounts[className]) {
@@ -96,12 +98,15 @@ function classDirective(name, selector) {
     }
 
     function arrayClasses(classVal) {
+      var classes = [];
       if (isArray(classVal)) {
-        return classVal.join(' ').split(' ');
+        forEach(classVal, function(v) {
+          classes = classes.concat(arrayClasses(v));
+        });
+        return classes;
       } else if (isString(classVal)) {
         return classVal.split(' ');
       } else if (isObject(classVal)) {
-        var classes = [];
         forEach(classVal, function(v, k) {
           if (v) {
             classes = classes.concat(k.split(' '));
@@ -129,16 +134,18 @@ function classDirective(name, selector) {
  * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
  * names.
  *
- * 2. If the expression evaluates to an array, each element of the array should be a string that is
- * one or more space-delimited class names.
- *
- * 3. If the expression evaluates to an object, then for each key-value pair of the
+ * 2. If the expression evaluates to an object, then for each key-value pair of the
  * object with a truthy value the corresponding key is used as a class name.
  *
+ * 3. If the expression evaluates to an array, each element of the array should either be a string as in
+ * type 1 or an object as in type 2. This means that you can mix strings and objects together in an array
+ * to give you more control over what CSS classes appear. See the code below for an example of this.
+ *
+ *
  * The directive won't add duplicate classes if a particular class was already set.
  *
- * When the expression changes, the previously added classes are removed and only then the
- * new classes are added.
+ * When the expression changes, the previously added classes are removed and only then are the
+ * new classes added.
  *
  * @animations
  * **add** - happens just before the class is applied to the elements
@@ -155,22 +162,39 @@ function classDirective(name, selector) {
  * @example Example that demonstrates basic bindings via ngClass directive.
    <example>
      <file name="index.html">
-       <p ng-class="{strike: deleted, bold: important, red: error}">Map Syntax Example</p>
-       <input type="checkbox" ng-model="deleted"> deleted (apply "strike" class)<br>
-       <input type="checkbox" ng-model="important"> important (apply "bold" class)<br>
-       <input type="checkbox" ng-model="error"> error (apply "red" class)
+       <p ng-class="{strike: deleted, bold: important, 'has-error': error}">Map Syntax Example</p>
+       <label>
+          <input type="checkbox" ng-model="deleted">
+          deleted (apply "strike" class)
+       </label><br>
+       <label>
+          <input type="checkbox" ng-model="important">
+          important (apply "bold" class)
+       </label><br>
+       <label>
+          <input type="checkbox" ng-model="error">
+          error (apply "has-error" class)
+       </label>
        <hr>
        <p ng-class="style">Using String Syntax</p>
-       <input type="text" ng-model="style" placeholder="Type: bold strike red">
+       <input type="text" ng-model="style"
+              placeholder="Type: bold strike red" aria-label="Type: bold strike red">
        <hr>
        <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
-       <input ng-model="style1" placeholder="Type: bold, strike or red"><br>
-       <input ng-model="style2" placeholder="Type: bold, strike or red"><br>
-       <input ng-model="style3" placeholder="Type: bold, strike or red"><br>
+       <input ng-model="style1"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red"><br>
+       <input ng-model="style2"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 2"><br>
+       <input ng-model="style3"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 3"><br>
+       <hr>
+       <p ng-class="[style4, {orange: warning}]">Using Array and Map Syntax</p>
+       <input ng-model="style4" placeholder="Type: bold, strike" aria-label="Type: bold, strike"><br>
+       <label><input type="checkbox" ng-model="warning"> warning (apply "orange" class)</label>
      </file>
      <file name="style.css">
        .strike {
-         text-decoration: line-through;
+           text-decoration: line-through;
        }
        .bold {
            font-weight: bold;
@@ -178,6 +202,13 @@ function classDirective(name, selector) {
        .red {
            color: red;
        }
+       .has-error {
+           color: red;
+           background-color: yellow;
+       }
+       .orange {
+           color: orange;
+       }
      </file>
      <file name="protractor.js" type="protractor">
        var ps = element.all(by.css('p'));
@@ -185,13 +216,13 @@ function classDirective(name, selector) {
        it('should let you toggle the class', function() {
 
          expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
-         expect(ps.first().getAttribute('class')).not.toMatch(/red/);
+         expect(ps.first().getAttribute('class')).not.toMatch(/has-error/);
 
          element(by.model('important')).click();
          expect(ps.first().getAttribute('class')).toMatch(/bold/);
 
          element(by.model('error')).click();
-         expect(ps.first().getAttribute('class')).toMatch(/red/);
+         expect(ps.first().getAttribute('class')).toMatch(/has-error/);
        });
 
        it('should let you toggle string example', function() {
@@ -202,11 +233,18 @@ function classDirective(name, selector) {
        });
 
        it('array example should have 3 classes', function() {
-         expect(ps.last().getAttribute('class')).toBe('');
+         expect(ps.get(2).getAttribute('class')).toBe('');
          element(by.model('style1')).sendKeys('bold');
          element(by.model('style2')).sendKeys('strike');
          element(by.model('style3')).sendKeys('red');
-         expect(ps.last().getAttribute('class')).toBe('bold strike red');
+         expect(ps.get(2).getAttribute('class')).toBe('bold strike red');
+       });
+
+       it('array with map example should have 2 classes', function() {
+         expect(ps.last().getAttribute('class')).toBe('');
+         element(by.model('style4')).sendKeys('bold');
+         element(by.model('warning')).click();
+         expect(ps.last().getAttribute('class')).toBe('bold orange');
        });
      </file>
    </example>
@@ -256,8 +294,8 @@ function classDirective(name, selector) {
    The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
    Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
    any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
-   to view the step by step details of {@link ng.$animate#addClass $animate.addClass} and
-   {@link ng.$animate#removeClass $animate.removeClass}.
+   to view the step by step details of {@link $animate#addClass $animate.addClass} and
+   {@link $animate#removeClass $animate.removeClass}.
  */
 var ngClassDirective = classDirective('', true);
 
diff --git a/src/ng/directive/ngCloak.js b/src/ng/directive/ngCloak.js
index bf19117a3336..19bd25c83252 100644
--- a/src/ng/directive/ngCloak.js
+++ b/src/ng/directive/ngCloak.js
@@ -33,17 +33,13 @@
  * document; alternatively, the css rule above must be included in the external stylesheet of the
  * application.
  *
- * Legacy browsers, like IE7, do not provide attribute selector support (added in CSS 2.1) so they
- * cannot match the `[ng\:cloak]` selector. To work around this limitation, you must add the css
- * class `ng-cloak` in addition to the `ngCloak` directive as shown in the example below.
- *
  * @element ANY
  *
  * @example
    <example>
      <file name="index.html">
         <div id="template1" ng-cloak>{{ 'hello' }}</div>
-        <div id="template2" ng-cloak class="ng-cloak">{{ 'hello IE7' }}</div>
+        <div id="template2" class="ng-cloak">{{ 'world' }}</div>
      </file>
      <file name="protractor.js" type="protractor">
        it('should remove the template directive and css class', function() {
diff --git a/src/ng/directive/ngController.js b/src/ng/directive/ngController.js
index e759d2b5c1b2..fe742d7d6ca7 100644
--- a/src/ng/directive/ngController.js
+++ b/src/ng/directive/ngController.js
@@ -64,20 +64,20 @@
  * <example name="ngControllerAs" module="controllerAsExample">
  *   <file name="index.html">
  *    <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
- *      Name: <input type="text" ng-model="settings.name"/>
- *      [ <a href="" ng-click="settings.greet()">greet</a> ]<br/>
+ *      <label>Name: <input type="text" ng-model="settings.name"/></label>
+ *      <button ng-click="settings.greet()">greet</button><br/>
  *      Contact:
  *      <ul>
  *        <li ng-repeat="contact in settings.contacts">
- *          <select ng-model="contact.type">
+ *          <select ng-model="contact.type" aria-label="Contact method" id="select_{{$index}}">
  *             <option>phone</option>
  *             <option>email</option>
  *          </select>
- *          <input type="text" ng-model="contact.value"/>
- *          [ <a href="" ng-click="settings.clearContact(contact)">clear</a>
- *          | <a href="" ng-click="settings.removeContact(contact)">X</a> ]
+ *          <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+ *          <button ng-click="settings.clearContact(contact)">clear</button>
+ *          <button ng-click="settings.removeContact(contact)" aria-label="Remove">X</button>
  *        </li>
- *        <li>[ <a href="" ng-click="settings.addContact()">add</a> ]</li>
+ *        <li><button ng-click="settings.addContact()">add</button></li>
  *     </ul>
  *    </div>
  *   </file>
@@ -127,12 +127,12 @@
  *       expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
  *           .toBe('john.smith@example.org');
  *
- *       firstRepeat.element(by.linkText('clear')).click();
+ *       firstRepeat.element(by.buttonText('clear')).click();
  *
  *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
  *           .toBe('');
  *
- *       container.element(by.linkText('add')).click();
+ *       container.element(by.buttonText('add')).click();
  *
  *       expect(container.element(by.repeater('contact in settings.contacts').row(2))
  *           .element(by.model('contact.value'))
@@ -147,20 +147,20 @@
  * <example name="ngController" module="controllerExample">
  *  <file name="index.html">
  *   <div id="ctrl-exmpl" ng-controller="SettingsController2">
- *     Name: <input type="text" ng-model="name"/>
- *     [ <a href="" ng-click="greet()">greet</a> ]<br/>
+ *     <label>Name: <input type="text" ng-model="name"/></label>
+ *     <button ng-click="greet()">greet</button><br/>
  *     Contact:
  *     <ul>
  *       <li ng-repeat="contact in contacts">
- *         <select ng-model="contact.type">
+ *         <select ng-model="contact.type" id="select_{{$index}}">
  *            <option>phone</option>
  *            <option>email</option>
  *         </select>
- *         <input type="text" ng-model="contact.value"/>
- *         [ <a href="" ng-click="clearContact(contact)">clear</a>
- *         | <a href="" ng-click="removeContact(contact)">X</a> ]
+ *         <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+ *         <button ng-click="clearContact(contact)">clear</button>
+ *         <button ng-click="removeContact(contact)">X</button>
  *       </li>
- *       <li>[ <a href="" ng-click="addContact()">add</a> ]</li>
+ *       <li>[ <button ng-click="addContact()">add</button> ]</li>
  *    </ul>
  *   </div>
  *  </file>
@@ -210,12 +210,12 @@
  *      expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
  *          .toBe('john.smith@example.org');
  *
- *      firstRepeat.element(by.linkText('clear')).click();
+ *      firstRepeat.element(by.buttonText('clear')).click();
  *
  *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
  *          .toBe('');
  *
- *      container.element(by.linkText('add')).click();
+ *      container.element(by.buttonText('add')).click();
  *
  *      expect(container.element(by.repeater('contact in contacts').row(2))
  *          .element(by.model('contact.value'))
diff --git a/src/ng/directive/ngCsp.js b/src/ng/directive/ngCsp.js
index 974d2e9305fb..378333b4a854 100644
--- a/src/ng/directive/ngCsp.js
+++ b/src/ng/directive/ngCsp.js
@@ -6,27 +6,29 @@
  *
  * @element html
  * @description
- * Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support.
+ *
+ * Angular has some features that can break certain
+ * [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) rules.
+ *
+ * If you intend to implement these rules then you must tell Angular not to use these features.
  *
  * This is necessary when developing things like Google Chrome Extensions or Universal Windows Apps.
  *
- * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
- * For Angular to be CSP compatible there are only two things that we need to do differently:
  *
- * - don't use `Function` constructor to generate optimized value getters
- * - don't inject custom stylesheet into the document
+ * The following rules affect Angular:
  *
- * AngularJS uses `Function(string)` generated functions as a speed optimization. Applying the `ngCsp`
- * directive will cause Angular to use CSP compatibility mode. When this mode is on AngularJS will
- * evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will
- * be raised.
+ * * `unsafe-eval`: this rule forbids apps to use `eval` or `Function(string)` generated functions
+ * (among other things). Angular makes use of this in the {@link $parse} service to provide a 30%
+ * increase in the speed of evaluating Angular expressions.
  *
- * CSP forbids JavaScript to inline stylesheet rules. In non CSP mode Angular automatically
- * includes some CSS rules (e.g. {@link ng.directive:ngCloak ngCloak}).
- * To make those directives work in CSP mode, include the `angular-csp.css` manually.
+ * * `unsafe-inline`: this rule forbids apps from inject custom styles into the document. Angular
+ * makes use of this to include some CSS rules (e.g. {@link ngCloak} and {@link ngHide}).
+ * To make these directives work when a CSP rule is blocking inline styles, you must link to the
+ * `angular-csp.css` in your HTML manually.
  *
- * Angular tries to autodetect if CSP is active and automatically turn on the CSP-safe mode. This
- * autodetection however triggers a CSP error to be logged in the console:
+ * If you do not provide `ngCsp` then Angular tries to autodetect if CSP is blocking unsafe-eval
+ * and automatically deactivates this feature in the {@link $parse} service. This autodetection,
+ * however, triggers a CSP error to be logged in the console:
  *
  * ```
  * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
@@ -35,11 +37,39 @@
  * ```
  *
  * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
- * directive on the root element of the application or on the `angular.js` script tag, whichever
- * appears first in the html document.
+ * directive on an element of the HTML document that appears before the `<script>` tag that loads
+ * the `angular.js` file.
  *
  * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
  *
+ * You can specify which of the CSP related Angular features should be deactivated by providing
+ * a value for the `ng-csp` attribute. The options are as follows:
+ *
+ * * no-inline-style: this stops Angular from injecting CSS styles into the DOM
+ *
+ * * no-unsafe-eval: this stops Angular from optimising $parse with unsafe eval of strings
+ *
+ * You can use these values in the following combinations:
+ *
+ *
+ * * No declaration means that Angular will assume that you can do inline styles, but it will do
+ * a runtime check for unsafe-eval. E.g. `<body>`. This is backwardly compatible with previous versions
+ * of Angular.
+ *
+ * * A simple `ng-csp` (or `data-ng-csp`) attribute will tell Angular to deactivate both inline
+ * styles and unsafe eval. E.g. `<body ng-csp>`. This is backwardly compatible with previous versions
+ * of Angular.
+ *
+ * * Specifying only `no-unsafe-eval` tells Angular that we must not use eval, but that we can inject
+ * inline styles. E.g. `<body ng-csp="no-unsafe-eval">`.
+ *
+ * * Specifying only `no-inline-style` tells Angular that we must not inject styles, but that we can
+ * run eval - no automcatic check for unsafe eval will occur. E.g. `<body ng-csp="no-inline-style">`
+ *
+ * * Specifying both `no-unsafe-eval` and `no-inline-style` tells Angular that we must not inject
+ * styles nor use eval, which is the same as an empty: ng-csp.
+ * E.g.`<body ng-csp="no-inline-style;no-unsafe-eval">`
+ *
  * @example
  * This example shows how to apply the `ngCsp` directive to the `html` tag.
    ```html
@@ -171,4 +201,4 @@
 
 // ngCsp is not implemented as a proper directive any more, because we need it be processed while we
 // bootstrap the system (before $parse is instantiated), for this reason we just have
-// the csp.isActive() fn that looks for ng-csp attribute anywhere in the current doc
+// the csp() fn that looks for the `ng-csp` attribute anywhere in the current doc
diff --git a/src/ng/directive/ngIf.js b/src/ng/directive/ngIf.js
index 5ad6c1d66ca1..2845250a86be 100644
--- a/src/ng/directive/ngIf.js
+++ b/src/ng/directive/ngIf.js
@@ -4,6 +4,7 @@
  * @ngdoc directive
  * @name ngIf
  * @restrict A
+ * @multiElement
  *
  * @description
  * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
@@ -46,7 +47,7 @@
  * @example
   <example module="ngAnimate" deps="angular-animate.js" animations="true">
     <file name="index.html">
-      Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /><br/>
+      <label>Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /></label><br/>
       Show when checked:
       <span ng-if="checked" class="animate-if">
         This is removed when the checkbox is unchecked.
diff --git a/src/ng/directive/ngInclude.js b/src/ng/directive/ngInclude.js
index c4540c7c1074..528958a943e2 100644
--- a/src/ng/directive/ngInclude.js
+++ b/src/ng/directive/ngInclude.js
@@ -178,8 +178,8 @@
  * @param {Object} angularEvent Synthetic event object.
  * @param {String} src URL of content to load.
  */
-var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate', '$sce',
-                  function($templateRequest,   $anchorScroll,   $animate,   $sce) {
+var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate',
+                  function($templateRequest,   $anchorScroll,   $animate) {
   return {
     restrict: 'ECA',
     priority: 400,
@@ -215,7 +215,7 @@ var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate', '$sce
           }
         };
 
-        scope.$watch($sce.parseAsResourceUrl(srcExp), function ngIncludeWatchAction(src) {
+        scope.$watch(srcExp, function ngIncludeWatchAction(src) {
           var afterAnimation = function() {
             if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) {
               $anchorScroll();
diff --git a/src/ng/directive/ngInit.js b/src/ng/directive/ngInit.js
index 44b76856f4e7..37fc51f3d7f9 100644
--- a/src/ng/directive/ngInit.js
+++ b/src/ng/directive/ngInit.js
@@ -9,7 +9,7 @@
  * The `ngInit` directive allows you to evaluate an expression in the
  * current scope.
  *
- * <div class="alert alert-error">
+ * <div class="alert alert-danger">
  * The only appropriate use of `ngInit` is for aliasing special properties of
  * {@link ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below. Besides this case, you
  * should use {@link guide/controller controllers} rather than `ngInit`
diff --git a/src/ng/directive/ngList.js b/src/ng/directive/ngList.js
index 7415336cc266..0b48853eb07d 100644
--- a/src/ng/directive/ngList.js
+++ b/src/ng/directive/ngList.js
@@ -30,9 +30,11 @@
  *   </file>
  *   <file name="index.html">
  *    <form name="myForm" ng-controller="ExampleController">
- *      List: <input name="namesInput" ng-model="names" ng-list required>
- *      <span class="error" ng-show="myForm.namesInput.$error.required">
+ *      <label>List: <input name="namesInput" ng-model="names" ng-list required></label>
+ *      <span role="alert">
+ *        <span class="error" ng-show="myForm.namesInput.$error.required">
  *        Required!</span>
+ *      </span>
  *      <br>
  *      <tt>names = {{names}}</tt><br/>
  *      <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
diff --git a/src/ng/directive/ngModel.js b/src/ng/directive/ngModel.js
index 1db2283586c4..83f6f91c9508 100644
--- a/src/ng/directive/ngModel.js
+++ b/src/ng/directive/ngModel.js
@@ -129,8 +129,8 @@ is set to `true`. The parse error is stored in `ngModel.$error.parse`.
  * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
  * collaborate together to achieve the desired result.
  *
- * Note that `contenteditable` is an HTML5 attribute, which tells the browser to let the element
- * contents be edited in place by the user.  This will not work on older browsers.
+ * `contenteditable` is an HTML5 attribute, which tells the browser to let the element
+ * contents be edited in place by the user.
  *
  * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize}
  * module to automatically remove "bad" content like inline event listener (e.g. `<span onclick="...">`).
@@ -192,7 +192,7 @@ is set to `true`. The parse error is stored in `ngModel.$error.parse`.
             required>Change me!</div>
         <span ng-show="myForm.myWidget.$error.required">Required!</span>
        <hr>
-       <textarea ng-model="userContent"></textarea>
+       <textarea ng-model="userContent" aria-label="Dynamic textarea"></textarea>
       </form>
     </file>
     <file name="protractor.js" type="protractor">
@@ -244,6 +244,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
       ngModelGet = parsedNgModel,
       ngModelSet = parsedNgModelAssign,
       pendingDebounce = null,
+      parserValid,
       ctrl = this;
 
   this.$$setOptions = function(options) {
@@ -473,12 +474,14 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
    *        <p>Now see what happens if you start typing then press the Escape key</p>
    *
    *       <form name="myForm" ng-model-options="{ updateOn: 'blur' }">
-   *         <p>With $rollbackViewValue()</p>
-   *         <input name="myInput1" ng-model="myValue" ng-keydown="resetWithCancel($event)"><br/>
+   *         <p id="inputDescription1">With $rollbackViewValue()</p>
+   *         <input name="myInput1" aria-describedby="inputDescription1" ng-model="myValue"
+   *                ng-keydown="resetWithCancel($event)"><br/>
    *         myValue: "{{ myValue }}"
    *
-   *         <p>Without $rollbackViewValue()</p>
-   *         <input name="myInput2" ng-model="myValue" ng-keydown="resetWithoutCancel($event)"><br/>
+   *         <p id="inputDescription2">Without $rollbackViewValue()</p>
+   *         <input name="myInput2" aria-describedby="inputDescription2" ng-model="myValue"
+   *                ng-keydown="resetWithoutCancel($event)"><br/>
    *         myValue: "{{ myValue }}"
    *       </form>
    *     </div>
@@ -501,7 +504,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
    * If the validity changes to invalid, the model will be set to `undefined`,
    * unless {@link ngModelOptions `ngModelOptions.allowInvalid`} is `true`.
    * If the validity changes to valid, it will set the model to the last available valid
-   * modelValue, i.e. either the last parsed value or the last value set from the scope.
+   * `$modelValue`, i.e. either the last parsed value or the last value set from the scope.
    */
   this.$validate = function() {
     // ignore $validate before model is initialized
@@ -516,16 +519,12 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
     // the model although neither viewValue nor the model on the scope changed
     var modelValue = ctrl.$$rawModelValue;
 
-    // Check if the there's a parse error, so we don't unset it accidentially
-    var parserName = ctrl.$$parserName || 'parse';
-    var parserValid = ctrl.$error[parserName] ? false : undefined;
-
     var prevValid = ctrl.$valid;
     var prevModelValue = ctrl.$modelValue;
 
     var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid;
 
-    ctrl.$$runValidators(parserValid, modelValue, viewValue, function(allValid) {
+    ctrl.$$runValidators(modelValue, viewValue, function(allValid) {
       // If there was no change in validity, don't update the model
       // This prevents changing an invalid modelValue to undefined
       if (!allowInvalid && prevValid !== allValid) {
@@ -543,12 +542,12 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
 
   };
 
-  this.$$runValidators = function(parseValid, modelValue, viewValue, doneCallback) {
+  this.$$runValidators = function(modelValue, viewValue, doneCallback) {
     currentValidationRunId++;
     var localValidationRunId = currentValidationRunId;
 
     // check parser error
-    if (!processParseErrors(parseValid)) {
+    if (!processParseErrors()) {
       validationDone(false);
       return;
     }
@@ -558,21 +557,22 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
     }
     processAsyncValidators();
 
-    function processParseErrors(parseValid) {
+    function processParseErrors() {
       var errorKey = ctrl.$$parserName || 'parse';
-      if (parseValid === undefined) {
+      if (parserValid === undefined) {
         setValidity(errorKey, null);
       } else {
-        setValidity(errorKey, parseValid);
-        if (!parseValid) {
+        if (!parserValid) {
           forEach(ctrl.$validators, function(v, name) {
             setValidity(name, null);
           });
           forEach(ctrl.$asyncValidators, function(v, name) {
             setValidity(name, null);
           });
-          return false;
         }
+        // Set the parse error last, to prevent unsetting it, should a $validators key == parserName
+        setValidity(errorKey, parserValid);
+        return parserValid;
       }
       return true;
     }
@@ -667,7 +667,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
   this.$$parseAndValidate = function() {
     var viewValue = ctrl.$$lastCommittedViewValue;
     var modelValue = viewValue;
-    var parserValid = isUndefined(modelValue) ? undefined : true;
+    parserValid = isUndefined(modelValue) ? undefined : true;
 
     if (parserValid) {
       for (var i = 0; i < ctrl.$parsers.length; i++) {
@@ -693,7 +693,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
 
     // Pass the $$lastCommittedViewValue here, because the cached viewValue might be out of date.
     // This can happen if e.g. $setViewValue is called from inside a parser
-    ctrl.$$runValidators(parserValid, modelValue, ctrl.$$lastCommittedViewValue, function(allValid) {
+    ctrl.$$runValidators(modelValue, ctrl.$$lastCommittedViewValue, function(allValid) {
       if (!allowInvalid) {
         // Note: Don't check ctrl.$valid here, as we could have
         // external validators (e.g. calculated on the server),
@@ -812,8 +812,12 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
 
     // if scope model value and ngModel value are out of sync
     // TODO(perf): why not move this to the action fn?
-    if (modelValue !== ctrl.$modelValue) {
+    if (modelValue !== ctrl.$modelValue &&
+       // checks for NaN is needed to allow setting the model to NaN when there's an asyncValidator
+       (ctrl.$modelValue === ctrl.$modelValue || modelValue === modelValue)
+    ) {
       ctrl.$modelValue = ctrl.$$rawModelValue = modelValue;
+      parserValid = undefined;
 
       var formatters = ctrl.$formatters,
           idx = formatters.length;
@@ -826,7 +830,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
         ctrl.$viewValue = ctrl.$$lastCommittedViewValue = viewValue;
         ctrl.$render();
 
-        ctrl.$$runValidators(undefined, modelValue, viewValue, noop);
+        ctrl.$$runValidators(modelValue, viewValue, noop);
       }
     }
 
@@ -941,10 +945,13 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
            background: red;
          }
        </style>
-       Update input to see transitions when valid/invalid.
-       Integer is a valid value.
+       <p id="inputDescription">
+        Update input to see transitions when valid/invalid.
+        Integer is a valid value.
+       </p>
        <form name="testForm" ng-controller="ExampleController">
-         <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input" />
+         <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input"
+                aria-describedby="inputDescription" />
        </form>
      </file>
  * </example>
@@ -974,10 +981,11 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
      <file name="index.html">
        <div ng-controller="ExampleController">
          <form name="userForm">
-           Name:
-           <input type="text" name="userName"
-                  ng-model="user.name"
-                  ng-model-options="{ getterSetter: true }" />
+           <label>Name:
+             <input type="text" name="userName"
+                    ng-model="user.name"
+                    ng-model-options="{ getterSetter: true }" />
+           </label>
          </form>
          <pre>user.name = <span ng-bind="user.name()"></span></pre>
        </div>
@@ -988,10 +996,11 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
            var _name = 'Brian';
            $scope.user = {
              name: function(newName) {
-               if (angular.isDefined(newName)) {
-                 _name = newName;
-               }
-               return _name;
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
              }
            };
          }]);
@@ -1092,14 +1101,16 @@ var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
  *   - `debounce`: integer value which contains the debounce model update value in milliseconds. A
  *     value of 0 triggers an immediate update. If an object is supplied instead, you can specify a
  *     custom value for each event. For example:
- *     `ng-model-options="{ updateOn: 'default blur', debounce: {'default': 500, 'blur': 0} }"`
+ *     `ng-model-options="{ updateOn: 'default blur', debounce: { 'default': 500, 'blur': 0 } }"`
  *   - `allowInvalid`: boolean value which indicates that the model can be set with values that did
  *     not validate correctly instead of the default behavior of setting the model to undefined.
  *   - `getterSetter`: boolean value which determines whether or not to treat functions bound to
        `ngModel` as getters/setters.
  *   - `timezone`: Defines the timezone to be used to read/write the `Date` instance in the model for
- *     `<input type="date">`, `<input type="time">`, ... . Right now, the only supported value is `'UTC'`,
- *     otherwise the default timezone of the browser will be used.
+ *     `<input type="date">`, `<input type="time">`, ... . It understands UTC/GMT and the
+ *     continental US time zone abbreviations, but for general use, use a time zone offset, for
+ *     example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+ *     If not specified, the timezone of the browser will be used.
  *
  * @example
 
@@ -1111,14 +1122,15 @@ var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
     <file name="index.html">
       <div ng-controller="ExampleController">
         <form name="userForm">
-          Name:
-          <input type="text" name="userName"
-                 ng-model="user.name"
-                 ng-model-options="{ updateOn: 'blur' }"
-                 ng-keyup="cancel($event)" /><br />
-
-          Other data:
-          <input type="text" ng-model="user.data" /><br />
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ updateOn: 'blur' }"
+                   ng-keyup="cancel($event)" />
+          </label><br />
+          <label>Other data:
+            <input type="text" ng-model="user.data" />
+          </label><br />
         </form>
         <pre>user.name = <span ng-bind="user.name"></span></pre>
       </div>
@@ -1166,11 +1178,13 @@ var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
     <file name="index.html">
       <div ng-controller="ExampleController">
         <form name="userForm">
-          Name:
-          <input type="text" name="userName"
-                 ng-model="user.name"
-                 ng-model-options="{ debounce: 1000 }" />
-          <button ng-click="userForm.userName.$rollbackViewValue(); user.name=''">Clear</button><br />
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ debounce: 1000 }" />
+          </label>
+          <button ng-click="userForm.userName.$rollbackViewValue(); user.name=''">Clear</button>
+          <br />
         </form>
         <pre>user.name = <span ng-bind="user.name"></span></pre>
       </div>
@@ -1189,10 +1203,11 @@ var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
     <file name="index.html">
       <div ng-controller="ExampleController">
         <form name="userForm">
-          Name:
-          <input type="text" name="userName"
-                 ng-model="user.name"
-                 ng-model-options="{ getterSetter: true }" />
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ getterSetter: true }" />
+          </label>
         </form>
         <pre>user.name = <span ng-bind="user.name()"></span></pre>
       </div>
@@ -1203,7 +1218,11 @@ var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
           var _name = 'Brian';
           $scope.user = {
             name: function(newName) {
-              return angular.isDefined(newName) ? (_name = newName) : _name;
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
             }
           };
         }]);
@@ -1332,7 +1351,9 @@ function addSetValidityMethod(context) {
 function isObjectEmpty(obj) {
   if (obj) {
     for (var prop in obj) {
-      return false;
+      if (obj.hasOwnProperty(prop)) {
+        return false;
+      }
     }
   }
   return true;
diff --git a/src/ng/directive/ngOptions.js b/src/ng/directive/ngOptions.js
index f6ec5f227c0b..5f86dc4791ca 100644
--- a/src/ng/directive/ngOptions.js
+++ b/src/ng/directive/ngOptions.js
@@ -31,10 +31,21 @@ var ngOptionsMinErr = minErr('ngOptions');
  * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
  * option. See example below for demonstration.
  *
- * <div class="alert alert-warning">
- * **Note:** `ngModel` compares by reference, not value. This is important when binding to an
- * array of objects. See an example [in this jsfiddle](http://jsfiddle.net/qWzTb/).
- * </div>
+ * ## Complex Models (objects or collections)
+ *
+ * **Note:** By default, `ngModel` watches the model by reference, not value. This is important when
+ * binding any input directive to a model that is an object or a collection.
+ *
+ * Since this is a common situation for `ngOptions` the directive additionally watches the model using
+ * `$watchCollection` when the select has the `multiple` attribute or when there is a `track by` clause in
+ * the options expression. This allows ngOptions to trigger a re-rendering of the options even if the actual
+ * object/collection has not changed identity but only a property on the object or an item in the collection
+ * changes.
+ *
+ * Note that `$watchCollection` does a shallow comparison of the properties of the object (or the items in the collection
+ * if the model is an array). This means that changing a property deeper inside the object/collection that the
+ * first level will not trigger a re-rendering.
+ *
  *
  * ## `select` **`as`**
  *
@@ -53,7 +64,7 @@ var ngOptionsMinErr = minErr('ngOptions');
  * Consider the following example:
  *
  * ```html
- * <select ng-options="item.subItem as item.label for item in values track by item.id" ng-model="selected">
+ * <select ng-options="item.subItem as item.label for item in values track by item.id" ng-model="selected"></select>
  * ```
  *
  * ```js
@@ -94,15 +105,20 @@ var ngOptionsMinErr = minErr('ngOptions');
  *     * `label` **`for`** `value` **`in`** `array`
  *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
  *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array`
+ *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array`
  *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+ *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
  *     * `label` **`for`** `value` **`in`** `array` | orderBy:`orderexpr` **`track by`** `trackexpr`
  *        (for including a filter with `track by`)
  *   * for object data sources:
  *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
  *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
  *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
+ *     * `label` **`disable when`** `disable` **`for (`**`key`**`,`** `value`**`) in`** `object`
  *     * `select` **`as`** `label` **`group by`** `group`
  *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+ *     * `select` **`as`** `label` **`disable when`** `disable`
+ *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
  *
  * Where:
  *
@@ -116,6 +132,8 @@ var ngOptionsMinErr = minErr('ngOptions');
  *      element. If not specified, `select` expression will default to `value`.
  *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
  *      DOM element.
+ *   * `disable`: The result of this expression will be used to disable the rendered `<option>`
+ *      element. Return `true` to disable.
  *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
  *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
  *     `value` variable (e.g. `value.propertyName`). With this the selection is preserved
@@ -129,10 +147,10 @@ var ngOptionsMinErr = minErr('ngOptions');
           .controller('ExampleController', ['$scope', function($scope) {
             $scope.colors = [
               {name:'black', shade:'dark'},
-              {name:'white', shade:'light'},
+              {name:'white', shade:'light', notAnOption: true},
               {name:'red', shade:'dark'},
-              {name:'blue', shade:'dark'},
-              {name:'yellow', shade:'light'}
+              {name:'blue', shade:'dark', notAnOption: true},
+              {name:'yellow', shade:'light', notAnOption: false}
             ];
             $scope.myColor = $scope.colors[2]; // red
           }]);
@@ -140,30 +158,40 @@ var ngOptionsMinErr = minErr('ngOptions');
         <div ng-controller="ExampleController">
           <ul>
             <li ng-repeat="color in colors">
-              Name: <input ng-model="color.name">
-              [<a href ng-click="colors.splice($index, 1)">X</a>]
+              <label>Name: <input ng-model="color.name"></label>
+              <label><input type="checkbox" ng-model="color.notAnOption"> Disabled?</label>
+              <button ng-click="colors.splice($index, 1)" aria-label="Remove">X</button>
             </li>
             <li>
-              [<a href ng-click="colors.push({})">add</a>]
+              <button ng-click="colors.push({})">add</button>
             </li>
           </ul>
           <hr/>
-          Color (null not allowed):
-          <select ng-model="myColor" ng-options="color.name for color in colors"></select><br>
-
-          Color (null allowed):
+          <label>Color (null not allowed):
+            <select ng-model="myColor" ng-options="color.name for color in colors"></select>
+          </label><br/>
+          <label>Color (null allowed):
           <span  class="nullable">
             <select ng-model="myColor" ng-options="color.name for color in colors">
               <option value="">-- choose color --</option>
             </select>
-          </span><br/>
+          </span></label><br/>
 
-          Color grouped by shade:
-          <select ng-model="myColor" ng-options="color.name group by color.shade for color in colors">
-          </select><br/>
+          <label>Color grouped by shade:
+            <select ng-model="myColor" ng-options="color.name group by color.shade for color in colors">
+            </select>
+          </label><br/>
+
+          <label>Color grouped by shade, with some disabled:
+            <select ng-model="myColor"
+                  ng-options="color.name group by color.shade disable when color.notAnOption for color in colors">
+            </select>
+          </label><br/>
 
 
-          Select <a href ng-click="myColor = { name:'not in list', shade: 'other' }">bogus</a>.<br>
+
+          Select <button ng-click="myColor = { name:'not in list', shade: 'other' }">bogus</button>.
+          <br/>
           <hr/>
           Currently selected: {{ {selected_color:myColor} }}
           <div style="border:solid 1px black; height:20px"
@@ -186,16 +214,17 @@ var ngOptionsMinErr = minErr('ngOptions');
  */
 
 // jshint maxlen: false
-                         //000011111111110000000000022222222220000000000000000000003333333333000000000000004444444444444440000000005555555555555550000000666666666666666000000000000000777777777700000000000000000008888888888
-var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
+//                     //00001111111111000000000002222222222000000000000000000000333333333300000000000000000000000004444444444400000000000005555555555555550000000006666666666666660000000777777777777777000000000000000888888888800000000000000000009999999999
+var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
                         // 1: value expression (valueFn)
                         // 2: label expression (displayFn)
                         // 3: group by expression (groupByFn)
-                        // 4: array item variable name
-                        // 5: object item key variable name
-                        // 6: object item value variable name
-                        // 7: collection expression
-                        // 8: track by expression
+                        // 4: disable when expression (disableWhenFn)
+                        // 5: array item variable name
+                        // 6: object item key variable name
+                        // 7: object item value variable name
+                        // 8: collection expression
+                        // 9: track by expression
 // jshint maxlen: 100
 
 
@@ -215,14 +244,14 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
     // Extract the parts from the ngOptions expression
 
     // The variable name for the value of the item in the collection
-    var valueName = match[4] || match[6];
+    var valueName = match[5] || match[7];
     // The variable name for the key of the item in the collection
-    var keyName = match[5];
+    var keyName = match[6];
 
     // An expression that generates the viewValue for an option if there is a label expression
     var selectAs = / as /.test(match[0]) && match[1];
     // An expression that is used to track the id of each object in the options collection
-    var trackBy = match[8];
+    var trackBy = match[9];
     // An expression that generates the viewValue for an option if there is no label expression
     var valueFn = $parse(match[2] ? match[1] : valueName);
     var selectAsFn = selectAs && $parse(selectAs);
@@ -232,12 +261,17 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
     // Get the value by which we are going to track the option
     // if we have a trackFn then use that (passing scope and locals)
     // otherwise just hash the given viewValue
-    var getTrackByValue = trackBy ?
-                              function(viewValue, locals) { return trackByFn(scope, locals); } :
-                              function getHashOfValue(viewValue) { return hashKey(viewValue); };
+    var getTrackByValueFn = trackBy ?
+                              function(value, locals) { return trackByFn(scope, locals); } :
+                              function getHashOfValue(value) { return hashKey(value); };
+    var getTrackByValue = function(value, key) {
+      return getTrackByValueFn(value, getLocals(value, key));
+    };
+
     var displayFn = $parse(match[2] || match[1]);
     var groupByFn = $parse(match[3] || '');
-    var valuesFn = $parse(match[7]);
+    var disableWhenFn = $parse(match[4] || '');
+    var valuesFn = $parse(match[8]);
 
     var locals = {};
     var getLocals = keyName ? function(value, key) {
@@ -250,28 +284,63 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
     };
 
 
-    function Option(selectValue, viewValue, label, group) {
+    function Option(selectValue, viewValue, label, group, disabled) {
       this.selectValue = selectValue;
       this.viewValue = viewValue;
       this.label = label;
       this.group = group;
+      this.disabled = disabled;
+    }
+
+    function getOptionValuesKeys(optionValues) {
+      var optionValuesKeys;
+
+      if (!keyName && isArrayLike(optionValues)) {
+        optionValuesKeys = optionValues;
+      } else {
+        // if object, extract keys, in enumeration order, unsorted
+        optionValuesKeys = [];
+        for (var itemKey in optionValues) {
+          if (optionValues.hasOwnProperty(itemKey) && itemKey.charAt(0) !== '$') {
+            optionValuesKeys.push(itemKey);
+          }
+        }
+      }
+      return optionValuesKeys;
     }
 
     return {
-      getWatchables: $parse(valuesFn, function(values) {
+      trackBy: trackBy,
+      getTrackByValue: getTrackByValue,
+      getWatchables: $parse(valuesFn, function(optionValues) {
         // Create a collection of things that we would like to watch (watchedArray)
         // so that they can all be watched using a single $watchCollection
         // that only runs the handler once if anything changes
         var watchedArray = [];
-        values = values || [];
+        optionValues = optionValues || [];
 
-        Object.keys(values).forEach(function getWatchable(key) {
-          var locals = getLocals(values[key], key);
-          var label = displayFn(scope, locals);
-          var selectValue = getTrackByValue(values[key], locals);
+        var optionValuesKeys = getOptionValuesKeys(optionValues);
+        var optionValuesLength = optionValuesKeys.length;
+        for (var index = 0; index < optionValuesLength; index++) {
+          var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+          var value = optionValues[key];
+
+          var locals = getLocals(optionValues[key], key);
+          var selectValue = getTrackByValueFn(optionValues[key], locals);
           watchedArray.push(selectValue);
-          watchedArray.push(label);
-        });
+
+          // Only need to watch the displayFn if there is a specific label expression
+          if (match[2] || match[1]) {
+            var label = displayFn(scope, locals);
+            watchedArray.push(label);
+          }
+
+          // Only need to watch the disableWhenFn if there is a specific disable expression
+          if (match[4]) {
+            var disableWhen = disableWhenFn(scope, locals);
+            watchedArray.push(disableWhen);
+          }
+        }
         return watchedArray;
       }),
 
@@ -283,30 +352,34 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
         // The option values were already computed in the `getWatchables` fn,
         // which must have been called to trigger `getOptions`
         var optionValues = valuesFn(scope) || [];
+        var optionValuesKeys = getOptionValuesKeys(optionValues);
+        var optionValuesLength = optionValuesKeys.length;
 
-        var keys = Object.keys(optionValues);
-        keys.forEach(function getOption(key) {
-
-          // Ignore "angular" properties that start with $ or $$
-          if (key.charAt(0) === '$') return;
-
+        for (var index = 0; index < optionValuesLength; index++) {
+          var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
           var value = optionValues[key];
           var locals = getLocals(value, key);
           var viewValue = viewValueFn(scope, locals);
-          var selectValue = getTrackByValue(viewValue, locals);
+          var selectValue = getTrackByValueFn(viewValue, locals);
           var label = displayFn(scope, locals);
           var group = groupByFn(scope, locals);
-          var optionItem = new Option(selectValue, viewValue, label, group);
+          var disabled = disableWhenFn(scope, locals);
+          var optionItem = new Option(selectValue, viewValue, label, group, disabled);
 
           optionItems.push(optionItem);
           selectValueMap[selectValue] = optionItem;
-        });
+        }
 
         return {
           items: optionItems,
           selectValueMap: selectValueMap,
           getOptionFromViewValue: function(value) {
-            return selectValueMap[getTrackByValue(value, getLocals(value))];
+            return selectValueMap[getTrackByValue(value)];
+          },
+          getViewValueFromOption: function(option) {
+            // If the viewValue could be an object that may be mutated by the application,
+            // we need to make a copy and not return the reference to the value on the option.
+            return trackBy ? angular.copy(option.viewValue) : option.viewValue;
           }
         };
       }
@@ -332,7 +405,16 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
       var selectCtrl = ctrls[0];
       var multiple = attr.multiple;
 
-      var emptyOption = selectCtrl.emptyOption;
+      // The emptyOption allows the application developer to provide their own custom "empty"
+      // option when the viewValue does not match any of the option values.
+      var emptyOption;
+      for (var i = 0, children = selectElement.children(), ii = children.length; i < ii; i++) {
+        if (children[i].value === '') {
+          emptyOption = children.eq(i);
+          break;
+        }
+      }
+
       var providedEmptyOption = !!emptyOption;
 
       var unknownOption = jqLite(optionTemplate.cloneNode(false));
@@ -370,44 +452,54 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
       };
 
 
-      selectCtrl.writeValue = function writeNgOptionsValue(value) {
-        var option = options.getOptionFromViewValue(value);
+      // Update the controller methods for multiple selectable options
+      if (!multiple) {
 
-        if (option) {
-          if (selectElement[0].value !== option.selectValue) {
-            removeUnknownOption();
-            removeEmptyOption();
+        selectCtrl.writeValue = function writeNgOptionsValue(value) {
+          var option = options.getOptionFromViewValue(value);
 
-            selectElement[0].value = option.selectValue;
-            option.element.selected = true;
-            option.element.setAttribute('selected', 'selected');
-          }
-        } else {
-          if (value === null || providedEmptyOption) {
-            removeUnknownOption();
-            renderEmptyOption();
+          if (option && !option.disabled) {
+            if (selectElement[0].value !== option.selectValue) {
+              removeUnknownOption();
+              removeEmptyOption();
+
+              selectElement[0].value = option.selectValue;
+              option.element.selected = true;
+              option.element.setAttribute('selected', 'selected');
+            }
           } else {
-            removeEmptyOption();
-            renderUnknownOption();
+            if (value === null || providedEmptyOption) {
+              removeUnknownOption();
+              renderEmptyOption();
+            } else {
+              removeEmptyOption();
+              renderUnknownOption();
+            }
           }
-        }
-      };
+        };
 
-      selectCtrl.readValue = function readNgOptionsValue() {
+        selectCtrl.readValue = function readNgOptionsValue() {
 
-        var selectedOption = options.selectValueMap[selectElement.val()];
+          var selectedOption = options.selectValueMap[selectElement.val()];
 
-        if (selectedOption) {
-          removeEmptyOption();
-          removeUnknownOption();
-          return selectedOption.viewValue;
-        }
-        return null;
-      };
+          if (selectedOption && !selectedOption.disabled) {
+            removeEmptyOption();
+            removeUnknownOption();
+            return options.getViewValueFromOption(selectedOption);
+          }
+          return null;
+        };
 
+        // If we are using `track by` then we must watch the tracked value on the model
+        // since ngModel only watches for object identity change
+        if (ngOptions.trackBy) {
+          scope.$watch(
+            function() { return ngOptions.getTrackByValue(ngModelCtrl.$viewValue); },
+            function() { ngModelCtrl.$render(); }
+          );
+        }
 
-      // Update the controller methods for multiple selectable options
-      if (multiple) {
+      } else {
 
         ngModelCtrl.$isEmpty = function(value) {
           return !value || value.length === 0;
@@ -422,19 +514,39 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
           if (value) {
             value.forEach(function(item) {
               var option = options.getOptionFromViewValue(item);
-              if (option) option.element.selected = true;
+              if (option && !option.disabled) option.element.selected = true;
             });
           }
         };
 
 
         selectCtrl.readValue = function readNgOptionsMultiple() {
-          var selectedValues = selectElement.val() || [];
-          return selectedValues.map(function(selectedKey) {
-            var option = options.selectValueMap[selectedKey];
-            return option.viewValue;
+          var selectedValues = selectElement.val() || [],
+              selections = [];
+
+          forEach(selectedValues, function(value) {
+            var option = options.selectValueMap[value];
+            if (!option.disabled) selections.push(options.getViewValueFromOption(option));
           });
+
+          return selections;
         };
+
+        // If we are using `track by` then we must watch these tracked values on the model
+        // since ngModel only watches for object identity change
+        if (ngOptions.trackBy) {
+
+          scope.$watchCollection(function() {
+            if (isArray(ngModelCtrl.$viewValue)) {
+              return ngModelCtrl.$viewValue.map(function(value) {
+                return ngOptions.getTrackByValue(value);
+              });
+            }
+          }, function() {
+            ngModelCtrl.$render();
+          });
+
+        }
       }
 
 
@@ -466,6 +578,7 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
 
       function updateOptionElement(option, element) {
         option.element = element;
+        element.disabled = option.disabled;
         if (option.value !== element.value) element.value = option.selectValue;
         if (option.label !== element.label) {
           element.label = option.label;
@@ -601,10 +714,12 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
         // Check to see if the value has changed due to the update to the options
         if (!ngModelCtrl.$isEmpty(previousValue)) {
           var nextValue = selectCtrl.readValue();
-          if (!equals(previousValue, nextValue)) {
+          if (ngOptions.trackBy ? !equals(previousValue, nextValue) : previousValue !== nextValue) {
             ngModelCtrl.$setViewValue(nextValue);
+            ngModelCtrl.$render();
           }
         }
+
       }
 
     }
diff --git a/src/ng/directive/ngPluralize.js b/src/ng/directive/ngPluralize.js
index 8a1b11a959e3..2703c3770aa1 100644
--- a/src/ng/directive/ngPluralize.js
+++ b/src/ng/directive/ngPluralize.js
@@ -103,9 +103,9 @@
             }]);
         </script>
         <div ng-controller="ExampleController">
-          Person 1:<input type="text" ng-model="person1" value="Igor" /><br/>
-          Person 2:<input type="text" ng-model="person2" value="Misko" /><br/>
-          Number of People:<input type="text" ng-model="personCount" value="1" /><br/>
+          <label>Person 1:<input type="text" ng-model="person1" value="Igor" /></label><br/>
+          <label>Person 2:<input type="text" ng-model="person2" value="Misko" /></label><br/>
+          <label>Number of People:<input type="text" ng-model="personCount" value="1" /></label><br/>
 
           <!--- Example with simple pluralization rules for en locale --->
           Without Offset:
@@ -180,7 +180,6 @@ var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale,
       IS_WHEN = /^when(Minus)?(.+)$/;
 
   return {
-    restrict: 'EA',
     link: function(scope, element, attr) {
       var numberExp = attr.count,
           whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
diff --git a/src/ng/directive/ngRepeat.js b/src/ng/directive/ngRepeat.js
index 5214acf86345..82796d996331 100644
--- a/src/ng/directive/ngRepeat.js
+++ b/src/ng/directive/ngRepeat.js
@@ -3,6 +3,7 @@
 /**
  * @ngdoc directive
  * @name ngRepeat
+ * @multiElement
  *
  * @description
  * The `ngRepeat` directive instantiates a template once per item from a collection. Each template
@@ -33,8 +34,8 @@
  * <div ng-repeat="(key, value) in myObj"> ... </div>
  * ```
  *
- * You need to be aware that the JavaScript specification does not define what order
- * it will return the keys for an object. (To mitigate this in Angular 1.3 the `ngRepeat` directive
+ * You need to be aware that the JavaScript specification does not define the order of keys
+ * returned for an object. (To mitigate this in Angular 1.3 the `ngRepeat` directive
  * used to sort the keys alphabetically.)
  *
  * Version 1.4 removed the alphabetic sorting. We now rely on the order returned by the browser
@@ -48,6 +49,64 @@
  * or implement a `$watch` on the object yourself.
  *
  *
+ * # Tracking and Duplicates
+ *
+ * When the contents of the collection change, `ngRepeat` makes the corresponding changes to the DOM:
+ *
+ * * When an item is added, a new instance of the template is added to the DOM.
+ * * When an item is removed, its template instance is removed from the DOM.
+ * * When items are reordered, their respective templates are reordered in the DOM.
+ *
+ * By default, `ngRepeat` does not allow duplicate items in arrays. This is because when
+ * there are duplicates, it is not possible to maintain a one-to-one mapping between collection
+ * items and DOM elements.
+ *
+ * If you do need to repeat duplicate items, you can substitute the default tracking behavior
+ * with your own using the `track by` expression.
+ *
+ * For example, you may track items by the index of each item in the collection, using the
+ * special scope property `$index`:
+ * ```html
+ *    <div ng-repeat="n in [42, 42, 43, 43] track by $index">
+ *      {{n}}
+ *    </div>
+ * ```
+ *
+ * You may use arbitrary expressions in `track by`, including references to custom functions
+ * on the scope:
+ * ```html
+ *    <div ng-repeat="n in [42, 42, 43, 43] track by myTrackingFunction(n)">
+ *      {{n}}
+ *    </div>
+ * ```
+ *
+ * If you are working with objects that have an identifier property, you can track
+ * by the identifier instead of the whole object. Should you reload your data later, `ngRepeat`
+ * will not have to rebuild the DOM elements for items it has already rendered, even if the
+ * JavaScript objects in the collection have been substituted for new ones:
+ * ```html
+ *    <div ng-repeat="model in collection track by model.id">
+ *      {{model.name}}
+ *    </div>
+ * ```
+ *
+ * When no `track by` expression is provided, it is equivalent to tracking by the built-in
+ * `$id` function, which tracks items by their identity:
+ * ```html
+ *    <div ng-repeat="obj in collection track by $id(obj)">
+ *      {{obj.prop}}
+ *    </div>
+ * ```
+ *
+ * <div class="alert alert-warning">
+ * **Note:** `track by` must always be the last expression:
+ * </div>
+ * ```
+ * <div ng-repeat="model in collection | orderBy: 'id' as filtered_result track by model.id">
+ *     {{model.name}}
+ * </div>
+ * ```
+ *
  * # Special repeat start and end points
  * To repeat a series of elements instead of just one parent element, ngRepeat (as well as other ng directives) supports extending
  * the range of the repeater by defining explicit start and end points by using **ng-repeat-start** and **ng-repeat-end** respectively.
@@ -115,12 +174,13 @@
  *
  *     For example: `(name, age) in {'adam':10, 'amalie':12}`.
  *
- *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking function
- *     which can be used to associate the objects in the collection with the DOM elements. If no tracking function
- *     is specified the ng-repeat associates elements by identity in the collection. It is an error to have
- *     more than one tracking function to resolve to the same key. (This would mean that two distinct objects are
- *     mapped to the same DOM element, which is not possible.)  Filters should be applied to the expression,
- *     before specifying a tracking expression.
+ *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking expression
+ *     which can be used to associate the objects in the collection with the DOM elements. If no tracking expression
+ *     is specified, ng-repeat associates elements by identity. It is an error to have
+ *     more than one tracking expression value resolve to the same key. (This would mean that two distinct objects are
+ *     mapped to the same DOM element, which is not possible.)
+ *
+ *     Note that the tracking expression must come last, after any filters, and the alias expression.
  *
  *     For example: `item in items` is equivalent to `item in items track by $id(item)`. This implies that the DOM elements
  *     will be associated by item identity in the array.
@@ -144,6 +204,11 @@
  *     For example: `item in items | filter:x as results` will store the fragment of the repeated items as `results`, but only after
  *     the items have been processed through the filter.
  *
+ *     Please note that `as [variable name] is not an operator but rather a part of ngRepeat micro-syntax so it can be used only at the end
+ *     (and not as operator, inside an expression).
+ *
+ *     For example: `item in items | filter : x | orderBy : order | limitTo : limit as results` .
+ *
  * @example
  * This example initializes the scope to a list of names and
  * then uses `ngRepeat` to display every person:
@@ -162,7 +227,7 @@
         {name:'Samantha', age:60, gender:'girl'}
       ]">
         I have {{friends.length}} friends. They are:
-        <input type="search" ng-model="q" placeholder="filter friends..." />
+        <input type="search" ng-model="q" placeholder="filter friends..." aria-label="filter friends" />
         <ul class="example-animate-container">
           <li class="animate-repeat" ng-repeat="friend in friends | filter:q as results">
             [{{$index + 1}}] {{friend.name}} who is {{friend.age}} years old.
diff --git a/src/ng/directive/ngShowHide.js b/src/ng/directive/ngShowHide.js
index dad6f8911f23..48c079b706ff 100644
--- a/src/ng/directive/ngShowHide.js
+++ b/src/ng/directive/ngShowHide.js
@@ -5,6 +5,7 @@ var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
 /**
  * @ngdoc directive
  * @name ngShow
+ * @multiElement
  *
  * @description
  * The `ngShow` directive shows or hides the given HTML element based on the expression
@@ -98,7 +99,7 @@ var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
  * @example
   <example module="ngAnimate" deps="angular-animate.js" animations="true">
     <file name="index.html">
-      Click me: <input type="checkbox" ng-model="checked"><br/>
+      Click me: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br/>
       <div>
         Show:
         <div class="check-element animate-show" ng-show="checked">
@@ -180,6 +181,7 @@ var ngShowDirective = ['$animate', function($animate) {
 /**
  * @ngdoc directive
  * @name ngHide
+ * @multiElement
  *
  * @description
  * The `ngHide` directive shows or hides the given HTML element based on the expression
@@ -263,7 +265,7 @@ var ngShowDirective = ['$animate', function($animate) {
  * @example
   <example module="ngAnimate" deps="angular-animate.js" animations="true">
     <file name="index.html">
-      Click me: <input type="checkbox" ng-model="checked"><br/>
+      Click me: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br/>
       <div>
         Show:
         <div class="check-element animate-hide" ng-show="checked">
diff --git a/src/ng/directive/ngStyle.js b/src/ng/directive/ngStyle.js
index 72c7ce0e544a..16da9bec496b 100644
--- a/src/ng/directive/ngStyle.js
+++ b/src/ng/directive/ngStyle.js
@@ -47,10 +47,10 @@
    </example>
  */
 var ngStyleDirective = ngDirective(function(scope, element, attr) {
-  scope.$watchCollection(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
+  scope.$watch(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
     if (oldStyles && (newStyles !== oldStyles)) {
       forEach(oldStyles, function(val, style) { element.css(style, '');});
     }
     if (newStyles) element.css(newStyles);
-  });
+  }, true);
 });
diff --git a/src/ng/directive/ngSwitch.js b/src/ng/directive/ngSwitch.js
index 4c11f62f0421..79155f433af5 100644
--- a/src/ng/directive/ngSwitch.js
+++ b/src/ng/directive/ngSwitch.js
@@ -43,7 +43,7 @@
  *
  * @scope
  * @priority 1200
- * @param {*} ngSwitch|on expression to match against <tt>ng-switch-when</tt>.
+ * @param {*} ngSwitch|on expression to match against <code>ng-switch-when</code>.
  * On child elements add:
  *
  * * `ngSwitchWhen`: the case statement to match against. If match then this
@@ -60,7 +60,7 @@
       <div ng-controller="ExampleController">
         <select ng-model="selection" ng-options="item for item in items">
         </select>
-        <tt>selection={{selection}}</tt>
+        <code>selection={{selection}}</code>
         <hr/>
         <div class="animate-switch-container"
           ng-switch on="selection">
@@ -130,7 +130,6 @@
  */
 var ngSwitchDirective = ['$animate', function($animate) {
   return {
-    restrict: 'EA',
     require: 'ngSwitch',
 
     // asks for $scope to fool the BC controller module
diff --git a/src/ng/directive/ngTransclude.js b/src/ng/directive/ngTransclude.js
index 4dd391ae5e93..36201a69ab73 100644
--- a/src/ng/directive/ngTransclude.js
+++ b/src/ng/directive/ngTransclude.js
@@ -34,8 +34,8 @@
          }]);
        </script>
        <div ng-controller="ExampleController">
-         <input ng-model="title"> <br/>
-         <textarea ng-model="text"></textarea> <br/>
+         <input ng-model="title" aria-label="title"> <br/>
+         <textarea ng-model="text" aria-label="text"></textarea> <br/>
          <pane title="{{title}}">{{text}}</pane>
        </div>
      </file>
diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js
index 838846405818..1162af9e486c 100644
--- a/src/ng/directive/select.js
+++ b/src/ng/directive/select.js
@@ -42,19 +42,6 @@ var SelectController =
     if (self.unknownOption.parent()) self.unknownOption.remove();
   };
 
-  // Here we find the option that represents the "empty" value, i.e. the option with a value
-  // of `""`.  This option needs to be accessed (to select it directly) when setting the value
-  // of the select to `""` because IE9 will not automatically select the option.
-  //
-  // Additionally, the `ngOptions` directive uses this option to allow the application developer
-  // to provide their own custom "empty" option when the viewValue does not match any of the
-  // option values.
-  for (var i = 0, children = $element.children(), ii = children.length; i < ii; i++) {
-    if (children[i].value === '') {
-      self.emptyOption = children.eq(i);
-      break;
-    }
-  }
 
   // Read the value of the select control, the implementation of this changes depending
   // upon whether the select can have multiple values and whether ngOptions is at work.
@@ -72,7 +59,8 @@ var SelectController =
       $element.val(value);
       if (value === '') self.emptyOption.prop('selected', true); // to make IE9 happy
     } else {
-      if (isUndefined(value) && self.emptyOption) {
+      if (value == null && self.emptyOption) {
+        self.removeUnknownOption();
         $element.val('');
       } else {
         self.renderUnknownOption(value);
@@ -82,8 +70,11 @@ var SelectController =
 
 
   // Tell the select control that an option, with the given value, has been added
-  self.addOption = function(value) {
+  self.addOption = function(value, element) {
     assertNotHasOwnProperty(value, '"option value"');
+    if (value === '') {
+      self.emptyOption = element;
+    }
     var count = optionsMap.get(value) || 0;
     optionsMap.put(value, count + 1);
   };
@@ -94,6 +85,9 @@ var SelectController =
     if (count) {
       if (count === 1) {
         optionsMap.remove(value);
+        if (value === '') {
+          self.emptyOption = undefined;
+        }
       } else {
         optionsMap.put(value, count - 1);
       }
@@ -118,9 +112,7 @@ var SelectController =
  * ngOptions} to achieve a similar result. However, `ngOptions` provides some benefits such as reducing
  * memory and increasing speed by not creating a new scope for each repeated instance, as well as providing
  * more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
- * comprehension expression. `ngOptions` should be used when the `<select>` model needs to be bound
- * to a non-string value. This is because an option element can only be bound to string values at
- * present.
+ * comprehension expression.
  *
  * When an item in the `<select>` menu is selected, the array element or object property
  * represented by the selected option will be bound to the model identified by the `ngModel`
@@ -133,14 +125,53 @@ var SelectController =
  * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
  * option. See example below for demonstration.
  *
- * <div class="alert alert-warning">
- * **Note:** `ngModel` compares by reference, not value. This is important when binding to an
- * array of objects. See an example [in this jsfiddle](http://jsfiddle.net/qWzTb/).
+ * <div class="alert alert-info">
+ * The value of a `select` directive used without `ngOptions` is always a string.
+ * When the model needs to be bound to a non-string value, you must either explictly convert it
+ * using a directive (see example below) or use `ngOptions` to specify the set of options.
+ * This is because an option element can only be bound to string values at present.
  * </div>
  *
+ * ### Example (binding `select` to a non-string value)
+ *
+ * <example name="select-with-non-string-options" module="nonStringSelect">
+ *   <file name="index.html">
+ *     <select ng-model="model.id" convert-to-number>
+ *       <option value="0">Zero</option>
+ *       <option value="1">One</option>
+ *       <option value="2">Two</option>
+ *     </select>
+ *     {{ model }}
+ *   </file>
+ *   <file name="app.js">
+ *     angular.module('nonStringSelect', [])
+ *       .run(function($rootScope) {
+ *         $rootScope.model = { id: 2 };
+ *       })
+ *       .directive('convertToNumber', function() {
+ *         return {
+ *           require: 'ngModel',
+ *           link: function(scope, element, attrs, ngModel) {
+ *             ngModel.$parsers.push(function(val) {
+ *               return parseInt(val, 10);
+ *             });
+ *             ngModel.$formatters.push(function(val) {
+ *               return '' + val;
+ *             });
+ *           }
+ *         };
+ *       });
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     it('should initialize to model', function() {
+ *       var select = element(by.css('select'));
+ *       expect(element(by.model('model.id')).$('option:checked').getText()).toEqual('Two');
+ *     });
+ *   </file>
+ * </example>
+ *
  */
 var selectDirective = function() {
-  var lastView;
 
   return {
     restrict: 'E',
@@ -199,11 +230,13 @@ var selectDirective = function() {
 
         // we have to do it on each watch since ngModel watches reference, but
         // we need to work of an array, so we need to see if anything was inserted/removed
+        var lastView, lastViewRef = NaN;
         scope.$watch(function selectMultipleWatch() {
-          if (!equals(lastView, ngModelCtrl.$viewValue)) {
+          if (lastViewRef === ngModelCtrl.$viewValue && !equals(lastView, ngModelCtrl.$viewValue)) {
             lastView = shallowCopy(ngModelCtrl.$viewValue);
             ngModelCtrl.$render();
           }
+          lastViewRef = ngModelCtrl.$viewValue;
         });
 
         // If we are a multiple select then value is now a collection
diff --git a/src/ng/filter.js b/src/ng/filter.js
index e32d1574f615..475124e6acb3 100644
--- a/src/ng/filter.js
+++ b/src/ng/filter.js
@@ -20,6 +20,13 @@
  * Dependency Injected. To achieve this a filter definition consists of a factory function which is
  * annotated with dependencies and is responsible for creating a filter function.
  *
+ * <div class="alert alert-warning">
+ * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+ * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+ * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+ * (`myapp_subsection_filterx`).
+ * </div>
+ *
  * ```js
  *   // Filter registration
  *   function MyModule($provide, $filterProvider) {
@@ -101,6 +108,14 @@ function $FilterProvider($provide) {
    * @name $filterProvider#register
    * @param {string|Object} name Name of the filter function, or an object map of filters where
    *    the keys are the filter names and the values are the filter factories.
+   *
+   *    <div class="alert alert-warning">
+   *    **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+   *    Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+   *    your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+   *    (`myapp_subsection_filterx`).
+   *    </div>
+    * @param {Function} factory If the first argument was a string, a factory function for the filter to be registered.
    * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
    *    of the registered filter instances.
    */
diff --git a/src/ng/filter/filter.js b/src/ng/filter/filter.js
index 0ec98fc27099..e63279c04d03 100644
--- a/src/ng/filter/filter.js
+++ b/src/ng/filter/filter.js
@@ -34,9 +34,11 @@
  *     `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but
  *     **will** be matched by `{$: 'John'}`.
  *
- *   - `function(value, index)`: A predicate function can be used to write arbitrary filters. The
- *     function is called for each element of `array`. The final result is an array of those
- *     elements that the predicate returned true for.
+ *   - `function(value, index, array)`: A predicate function can be used to write arbitrary filters.
+ *     The function is called for each element of the array, with the element, its index, and
+ *     the entire array itself as arguments.
+ *
+ *     The final result is an array of those elements that the predicate returned true for.
  *
  * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in
  *     determining if the expected value (from the filter expression) and actual value (from
@@ -54,6 +56,9 @@
  *   - `false|undefined`: A short hand for a function which will look for a substring match in case
  *     insensitive way.
  *
+ *     Primitive values are converted to strings. Objects are not compared against primitives,
+ *     unless they have a custom `toString` method (e.g. `Date` objects).
+ *
  * @example
    <example>
      <file name="index.html">
@@ -64,7 +69,7 @@
                                 {name:'Julie', phone:'555-8765'},
                                 {name:'Juliette', phone:'555-5678'}]"></div>
 
-       Search: <input ng-model="searchText">
+       <label>Search: <input ng-model="searchText"></label>
        <table id="searchTextResults">
          <tr><th>Name</th><th>Phone</th></tr>
          <tr ng-repeat="friend in friends | filter:searchText">
@@ -73,10 +78,10 @@
          </tr>
        </table>
        <hr>
-       Any: <input ng-model="search.$"> <br>
-       Name only <input ng-model="search.name"><br>
-       Phone only <input ng-model="search.phone"><br>
-       Equality <input type="checkbox" ng-model="strict"><br>
+       <label>Any: <input ng-model="search.$"></label> <br>
+       <label>Name only <input ng-model="search.name"></label><br>
+       <label>Phone only <input ng-model="search.phone"></label><br>
+       <label>Equality <input type="checkbox" ng-model="strict"></label><br>
        <table id="searchObjResults">
          <tr><th>Name</th><th>Phone</th></tr>
          <tr ng-repeat="friendObj in friends | filter:search:strict">
@@ -124,7 +129,7 @@
  */
 function filterFilter() {
   return function(array, expression, comparator) {
-    if (!isArray(array)) {
+    if (!isArrayLike(array)) {
       if (array == null) {
         return array;
       } else {
@@ -132,14 +137,16 @@ function filterFilter() {
       }
     }
 
+    var expressionType = getTypeForFilter(expression);
     var predicateFn;
     var matchAgainstAnyProp;
 
-    switch (typeof expression) {
+    switch (expressionType) {
       case 'function':
         predicateFn = expression;
         break;
       case 'boolean':
+      case 'null':
       case 'number':
       case 'string':
         matchAgainstAnyProp = true;
@@ -152,7 +159,7 @@ function filterFilter() {
         return array;
     }
 
-    return array.filter(predicateFn);
+    return Array.prototype.filter.call(array, predicateFn);
   };
 }
 
@@ -165,8 +172,16 @@ function createPredicateFn(expression, comparator, matchAgainstAnyProp) {
     comparator = equals;
   } else if (!isFunction(comparator)) {
     comparator = function(actual, expected) {
-      if (isObject(actual) || isObject(expected)) {
-        // Prevent an object to be considered equal to a string like `'[object'`
+      if (isUndefined(actual)) {
+        // No substring matching against `undefined`
+        return false;
+      }
+      if ((actual === null) || (expected === null)) {
+        // No substring matching against `null`; only match against `null`
+        return actual === expected;
+      }
+      if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) {
+        // Should not compare primitives against objects, unless they have custom `toString` method
         return false;
       }
 
@@ -187,8 +202,8 @@ function createPredicateFn(expression, comparator, matchAgainstAnyProp) {
 }
 
 function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) {
-  var actualType = typeof actual;
-  var expectedType = typeof expected;
+  var actualType = getTypeForFilter(actual);
+  var expectedType = getTypeForFilter(expected);
 
   if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
     return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp);
@@ -213,7 +228,7 @@ function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatc
       } else if (expectedType === 'object') {
         for (key in expected) {
           var expectedVal = expected[key];
-          if (isFunction(expectedVal)) {
+          if (isFunction(expectedVal) || isUndefined(expectedVal)) {
             continue;
           }
 
@@ -234,3 +249,8 @@ function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatc
       return comparator(actual, expected);
   }
 }
+
+// Used for easily differentiating between `null` and actual `object`
+function getTypeForFilter(val) {
+  return (val === null) ? 'null' : typeof val;
+}
diff --git a/src/ng/filter/filters.js b/src/ng/filter/filters.js
index 86ff54db1d64..7805085fd7d6 100644
--- a/src/ng/filter/filters.js
+++ b/src/ng/filter/filters.js
@@ -25,7 +25,7 @@
            }]);
        </script>
        <div ng-controller="ExampleController">
-         <input type="number" ng-model="amount"> <br>
+         <input type="number" ng-model="amount" aria-label="amount"> <br>
          default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
          custom currency identifier (USD$): <span id="currency-custom">{{amount | currency:"USD$"}}</span>
          no fractions (0): <span id="currency-no-fractions">{{amount | currency:"USD$":0}}</span>
@@ -45,9 +45,9 @@
          }
          element(by.model('amount')).clear();
          element(by.model('amount')).sendKeys('-1234');
-         expect(element(by.id('currency-default')).getText()).toBe('($1,234.00)');
-         expect(element(by.id('currency-custom')).getText()).toBe('(USD$1,234.00)');
-         expect(element(by.id('currency-no-fractions')).getText()).toBe('(USD$1,234)');
+         expect(element(by.id('currency-default')).getText()).toBe('-$1,234.00');
+         expect(element(by.id('currency-custom')).getText()).toBe('-USD$1,234.00');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('-USD$1,234');
        });
      </file>
    </example>
@@ -80,9 +80,10 @@ function currencyFilter($locale) {
  * @description
  * Formats a number as text.
  *
+ * If the input is null or undefined, it will just be returned.
+ * If the input is infinite (Infinity/-Infinity) the Infinity symbol '∞' is returned.
  * If the input is not a number an empty string is returned.
  *
- * If the input is an infinite (Infinity/-Infinity) the Infinity symbol '∞' is returned.
  *
  * @param {number|string} number Number to format.
  * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
@@ -100,7 +101,7 @@ function currencyFilter($locale) {
            }]);
        </script>
        <div ng-controller="ExampleController">
-         Enter number: <input ng-model='val'><br>
+         <label>Enter number: <input ng-model='val'></label><br>
          Default formatting: <span id='number-default'>{{val | number}}</span><br>
          No fractions: <span>{{val | number:0}}</span><br>
          Negative number: <span>{{-val | number:4}}</span>
@@ -302,6 +303,14 @@ function ampmGetter(date, formats) {
   return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
 }
 
+function eraGetter(date, formats) {
+  return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1];
+}
+
+function longEraGetter(date, formats) {
+  return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1];
+}
+
 var DATE_FORMATS = {
   yyyy: dateGetter('FullYear', 4),
     yy: dateGetter('FullYear', 2, 0, true),
@@ -328,10 +337,14 @@ var DATE_FORMATS = {
      a: ampmGetter,
      Z: timeZoneGetter,
     ww: weekGetter(2),
-     w: weekGetter(1)
+     w: weekGetter(1),
+     G: eraGetter,
+     GG: eraGetter,
+     GGG: eraGetter,
+     GGGG: longEraGetter
 };
 
-var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEw']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|w+))(.*)/,
+var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,
     NUMBER_STRING = /^\-?\d+$/;
 
 /**
@@ -368,6 +381,8 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEw']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d
  *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
  *   * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
  *   * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year
+ *   * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD')
+ *   * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini')
  *
  *   `format` string can also be one of the following predefined
  *   {@link guide/i18n localizable formats}:
@@ -393,7 +408,9 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEw']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d
  *    specified in the string input, the time is considered to be in the local timezone.
  * @param {string=} format Formatting rules (see Description). If not specified,
  *    `mediumDate` is used.
- * @param {string=} timezone Timezone to be used for formatting. Right now, only `'UTC'` is supported.
+ * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the
+ *    continental US time zone abbreviations, but for general use, use a time zone offset, for
+ *    example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
  *    If not specified, the timezone of the browser will be used.
  * @returns {string} Formatted string or the input if input is not recognized as date/millis.
  *
@@ -486,12 +503,8 @@ function dateFilter($locale) {
 
     var dateTimezoneOffset = date.getTimezoneOffset();
     if (timezone) {
-      var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
-      if (!isNaN(requestedTimezoneOffset)) {
-        date = new Date(date.getTime());
-        date.setMinutes(date.getMinutes() + dateTimezoneOffset - requestedTimezoneOffset);
-        dateTimezoneOffset = requestedTimezoneOffset;
-      }
+      dateTimezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
+      date = convertTimezoneToLocal(date, timezone, true);
     }
     forEach(parts, function(value) {
       fn = DATE_FORMATS[value];
diff --git a/src/ng/filter/limitTo.js b/src/ng/filter/limitTo.js
index df7b6fa3433d..a42ec8caf40f 100644
--- a/src/ng/filter/limitTo.js
+++ b/src/ng/filter/limitTo.js
@@ -17,6 +17,8 @@
  *     If the number is negative, `limit` number  of items from the end of the source array/string
  *     are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
  *     the input will be returned unchanged.
+ * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin`
+ *     indicates an offset from the end of `input`. Defaults to `0`.
  * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
  *     had less than `limit` elements.
  *
@@ -35,11 +37,20 @@
            }]);
        </script>
        <div ng-controller="ExampleController">
-         Limit {{numbers}} to: <input type="number" step="1" ng-model="numLimit">
+         <label>
+            Limit {{numbers}} to:
+            <input type="number" step="1" ng-model="numLimit">
+         </label>
          <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
-         Limit {{letters}} to: <input type="number" step="1" ng-model="letterLimit">
+         <label>
+            Limit {{letters}} to:
+            <input type="number" step="1" ng-model="letterLimit">
+         </label>
          <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
-         Limit {{longNumber}} to: <input type="number" step="1" ng-model="longNumberLimit">
+         <label>
+            Limit {{longNumber}} to:
+            <input type="number" step="1" ng-model="longNumberLimit">
+         </label>
          <p>Output long number: {{ longNumber | limitTo:longNumberLimit }}</p>
        </div>
      </file>
@@ -88,7 +99,7 @@
    </example>
 */
 function limitToFilter() {
-  return function(input, limit) {
+  return function(input, limit, begin) {
     if (Math.abs(Number(limit)) === Infinity) {
       limit = Number(limit);
     } else {
@@ -99,6 +110,17 @@ function limitToFilter() {
     if (isNumber(input)) input = input.toString();
     if (!isArray(input) && !isString(input)) return input;
 
-    return limit >= 0 ? input.slice(0, limit) : input.slice(limit);
+    begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
+    begin = (begin < 0 && begin >= -input.length) ? input.length + begin : begin;
+
+    if (limit >= 0) {
+      return input.slice(begin, begin + limit);
+    } else {
+      if (begin === 0) {
+        return input.slice(limit, input.length);
+      } else {
+        return input.slice(Math.max(0, begin + limit), begin);
+      }
+    }
   };
 }
diff --git a/src/ng/filter/orderBy.js b/src/ng/filter/orderBy.js
index 58b4c4bcd3e9..22d287f1dc3e 100644
--- a/src/ng/filter/orderBy.js
+++ b/src/ng/filter/orderBy.js
@@ -8,7 +8,7 @@
  * @description
  * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically
  * for strings and numerically for numbers. Note: if you notice numbers are not being sorted
- * correctly, make sure they are actually being saved as numbers and not strings.
+ * as expected, make sure they are actually being saved as numbers and not strings.
  *
  * @param {Array} array The array to sort.
  * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be
@@ -17,7 +17,7 @@
  *    Can be one of:
  *
  *    - `function`: Getter function. The result of this function will be sorted using the
- *      `<`, `=`, `>` operator.
+ *      `<`, `===`, `>` operator.
  *    - `string`: An Angular expression. The result of this expression is used to compare elements
  *      (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by
  *      3 first characters of a property called `name`). The result of a constant expression
@@ -34,7 +34,11 @@
  * @param {boolean=} reverse Reverse the order of the array.
  * @returns {Array} Sorted copy of the source array.
  *
+ *
  * @example
+ * The example below demonstrates a simple ngRepeat, where the data is sorted
+ * by age in descending order (predicate is set to `'-age'`).
+ * `reverse` is not set, which means it defaults to `false`.
    <example module="orderByExample">
      <file name="index.html">
        <script>
@@ -46,19 +50,73 @@
                   {name:'Mike', phone:'555-4321', age:21},
                   {name:'Adam', phone:'555-5678', age:35},
                   {name:'Julie', phone:'555-8765', age:29}];
-             $scope.predicate = '-age';
            }]);
        </script>
+       <div ng-controller="ExampleController">
+         <table class="friend">
+           <tr>
+             <th>Name</th>
+             <th>Phone Number</th>
+             <th>Age</th>
+           </tr>
+           <tr ng-repeat="friend in friends | orderBy:'-age'">
+             <td>{{friend.name}}</td>
+             <td>{{friend.phone}}</td>
+             <td>{{friend.age}}</td>
+           </tr>
+         </table>
+       </div>
+     </file>
+   </example>
+ *
+ * The predicate and reverse parameters can be controlled dynamically through scope properties,
+ * as shown in the next example.
+ * @example
+   <example module="orderByExample">
+     <file name="index.html">
+       <script>
+         angular.module('orderByExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.friends =
+                 [{name:'John', phone:'555-1212', age:10},
+                  {name:'Mary', phone:'555-9876', age:19},
+                  {name:'Mike', phone:'555-4321', age:21},
+                  {name:'Adam', phone:'555-5678', age:35},
+                  {name:'Julie', phone:'555-8765', age:29}];
+             $scope.predicate = 'age';
+             $scope.reverse = true;
+             $scope.order = function(predicate) {
+               $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
+               $scope.predicate = predicate;
+             };
+           }]);
+       </script>
+       <style type="text/css">
+         .sortorder:after {
+           content: '\25b2';
+         }
+         .sortorder.reverse:after {
+           content: '\25bc';
+         }
+       </style>
        <div ng-controller="ExampleController">
          <pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
          <hr/>
          [ <a href="" ng-click="predicate=''">unsorted</a> ]
          <table class="friend">
            <tr>
-             <th><a href="" ng-click="predicate = 'name'; reverse=false">Name</a>
-                 (<a href="" ng-click="predicate = '-name'; reverse=false">^</a>)</th>
-             <th><a href="" ng-click="predicate = 'phone'; reverse=!reverse">Phone Number</a></th>
-             <th><a href="" ng-click="predicate = 'age'; reverse=!reverse">Age</a></th>
+             <th>
+               <a href="" ng-click="order('name')">Name</a>
+               <span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span>
+             </th>
+             <th>
+               <a href="" ng-click="order('phone')">Phone Number</a>
+               <span class="sortorder" ng-show="predicate === 'phone'" ng-class="{reverse:reverse}"></span>
+             </th>
+             <th>
+               <a href="" ng-click="order('age')">Age</a>
+               <span class="sortorder" ng-show="predicate === 'age'" ng-class="{reverse:reverse}"></span>
+             </th>
            </tr>
            <tr ng-repeat="friend in friends | orderBy:predicate:reverse">
              <td>{{friend.name}}</td>
@@ -118,88 +176,114 @@
 orderByFilter.$inject = ['$parse'];
 function orderByFilter($parse) {
   return function(array, sortPredicate, reverseOrder) {
+
     if (!(isArrayLike(array))) return array;
-    sortPredicate = isArray(sortPredicate) ? sortPredicate : [sortPredicate];
+
+    if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
     if (sortPredicate.length === 0) { sortPredicate = ['+']; }
-    sortPredicate = sortPredicate.map(function(predicate) {
-      var descending = false, get = predicate || identity;
-      if (isString(predicate)) {
+
+    var predicates = processPredicates(sortPredicate, reverseOrder);
+
+    // The next three lines are a version of a Swartzian Transform idiom from Perl
+    // (sometimes called the Decorate-Sort-Undecorate idiom)
+    // See https://en.wikipedia.org/wiki/Schwartzian_transform
+    var compareValues = Array.prototype.map.call(array, getComparisonObject);
+    compareValues.sort(doComparison);
+    array = compareValues.map(function(item) { return item.value; });
+
+    return array;
+
+    function getComparisonObject(value, index) {
+      return {
+        value: value,
+        predicateValues: predicates.map(function(predicate) {
+          return getPredicateValue(predicate.get(value), index);
+        })
+      };
+    }
+
+    function doComparison(v1, v2) {
+      var result = 0;
+      for (var index=0, length = predicates.length; index < length; ++index) {
+        result = compare(v1.predicateValues[index], v2.predicateValues[index]) * predicates[index].descending;
+        if (result) break;
+      }
+      return result;
+    }
+  };
+
+  function processPredicates(sortPredicate, reverseOrder) {
+    reverseOrder = reverseOrder ? -1 : 1;
+    return sortPredicate.map(function(predicate) {
+      var descending = 1, get = identity;
+
+      if (isFunction(predicate)) {
+        get = predicate;
+      } else if (isString(predicate)) {
         if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) {
-          descending = predicate.charAt(0) == '-';
+          descending = predicate.charAt(0) == '-' ? -1 : 1;
           predicate = predicate.substring(1);
         }
-        if (predicate === '') {
-          // Effectively no predicate was passed so we compare identity
-          return reverseComparator(compare, descending);
-        }
-        get = $parse(predicate);
-        if (get.constant) {
-          var key = get();
-          return reverseComparator(function(a, b) {
-            return compare(a[key], b[key]);
-          }, descending);
+        if (predicate !== '') {
+          get = $parse(predicate);
+          if (get.constant) {
+            var key = get();
+            get = function(value) { return value[key]; };
+          }
         }
       }
-      return reverseComparator(function(a, b) {
-        return compare(get(a),get(b));
-      }, descending);
+      return { get: get, descending: descending * reverseOrder };
     });
-    return slice.call(array).sort(reverseComparator(comparator, reverseOrder));
+  }
 
-    function comparator(o1, o2) {
-      for (var i = 0; i < sortPredicate.length; i++) {
-        var comp = sortPredicate[i](o1, o2);
-        if (comp !== 0) return comp;
-      }
-      return 0;
-    }
-    function reverseComparator(comp, descending) {
-      return descending
-          ? function(a, b) {return comp(b,a);}
-          : comp;
+  function isPrimitive(value) {
+    switch (typeof value) {
+      case 'number': /* falls through */
+      case 'boolean': /* falls through */
+      case 'string':
+        return true;
+      default:
+        return false;
     }
+  }
 
-    function isPrimitive(value) {
-      switch (typeof value) {
-        case 'number': /* falls through */
-        case 'boolean': /* falls through */
-        case 'string':
-          return true;
-        default:
-          return false;
-      }
+  function objectValue(value, index) {
+    // If `valueOf` is a valid function use that
+    if (typeof value.valueOf === 'function') {
+      value = value.valueOf();
+      if (isPrimitive(value)) return value;
     }
+    // If `toString` is a valid function and not the one from `Object.prototype` use that
+    if (hasCustomToString(value)) {
+      value = value.toString();
+      if (isPrimitive(value)) return value;
+    }
+    // We have a basic object so we use the position of the object in the collection
+    return index;
+  }
 
-    function objectToString(value) {
-      if (value === null) return 'null';
-      if (typeof value.valueOf === 'function') {
-        value = value.valueOf();
-        if (isPrimitive(value)) return value;
-      }
-      if (typeof value.toString === 'function') {
-        value = value.toString();
-        if (isPrimitive(value)) return value;
-      }
-      return '';
+  function getPredicateValue(value, index) {
+    var type = typeof value;
+    if (value === null) {
+      type = 'string';
+      value = 'null';
+    } else if (type === 'string') {
+      value = value.toLowerCase();
+    } else if (type === 'object') {
+      value = objectValue(value, index);
     }
+    return { value: value, type: type };
+  }
 
-    function compare(v1, v2) {
-      var t1 = typeof v1;
-      var t2 = typeof v2;
-      if (t1 === t2 && t1 === "object") {
-        v1 = objectToString(v1);
-        v2 = objectToString(v2);
-      }
-      if (t1 === t2) {
-        if (t1 === "string") {
-           v1 = v1.toLowerCase();
-           v2 = v2.toLowerCase();
-        }
-        if (v1 === v2) return 0;
-        return v1 < v2 ? -1 : 1;
-      } else {
-        return t1 < t2 ? -1 : 1;
+  function compare(v1, v2) {
+    var result = 0;
+    if (v1.type === v2.type) {
+      if (v1.value !== v2.value) {
+        result = v1.value < v2.value ? -1 : 1;
       }
+    } else {
+      result = v1.type < v2.type ? -1 : 1;
     }
-  };
+    return result;
+  }
 }
diff --git a/src/ng/forceReflow.js b/src/ng/forceReflow.js
new file mode 100644
index 000000000000..deca55f76a2f
--- /dev/null
+++ b/src/ng/forceReflow.js
@@ -0,0 +1,24 @@
+'use strict';
+
+var $$ForceReflowProvider = function() {
+  this.$get = ['$document', function($document) {
+    return function(domNode) {
+      //the line below will force the browser to perform a repaint so
+      //that all the animated elements within the animation frame will
+      //be properly updated and drawn on screen. This is required to
+      //ensure that the preparation animation is properly flushed so that
+      //the active state picks up from there. DO NOT REMOVE THIS LINE.
+      //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH
+      //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND
+      //WILL TAKE YEARS AWAY FROM YOUR LIFE.
+      if (domNode) {
+        if (!domNode.nodeType && domNode instanceof jqLite) {
+          domNode = domNode[0];
+        }
+      } else {
+        domNode = $document[0].body;
+      }
+      return domNode.offsetWidth + 1;
+    };
+  }];
+};
diff --git a/src/ng/http.js b/src/ng/http.js
index a3cb265e3d10..81d1f67e2596 100644
--- a/src/ng/http.js
+++ b/src/ng/http.js
@@ -8,6 +8,129 @@ var JSON_ENDS = {
   '{': /}$/
 };
 var JSON_PROTECTION_PREFIX = /^\)\]\}',?\n/;
+var $httpMinErr = minErr('$http');
+var $httpMinErrLegacyFn = function(method) {
+  return function() {
+    throw $httpMinErr('legacy', 'The method `{0}` on the promise returned from `$http` has been disabled.', method);
+  };
+};
+
+function serializeValue(v) {
+  if (isObject(v)) {
+    return isDate(v) ? v.toISOString() : toJson(v);
+  }
+  return v;
+}
+
+
+function $HttpParamSerializerProvider() {
+  /**
+   * @ngdoc service
+   * @name $httpParamSerializer
+   * @description
+   *
+   * Default {@link $http `$http`} params serializer that converts objects to strings
+   * according to the following rules:
+   *
+   * * `{'foo': 'bar'}` results in `foo=bar`
+   * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
+   * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
+   * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object)
+   *
+   * Note that serializer will sort the request parameters alphabetically.
+   * */
+
+  this.$get = function() {
+    return function ngParamSerializer(params) {
+      if (!params) return '';
+      var parts = [];
+      forEachSorted(params, function(value, key) {
+        if (value === null || isUndefined(value)) return;
+        if (isArray(value)) {
+          forEach(value, function(v, k) {
+            parts.push(encodeUriQuery(key)  + '=' + encodeUriQuery(serializeValue(v)));
+          });
+        } else {
+          parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value)));
+        }
+      });
+
+      return parts.join('&');
+    };
+  };
+}
+
+function $HttpParamSerializerJQLikeProvider() {
+  /**
+   * @ngdoc service
+   * @name $httpParamSerializerJQLike
+   * @description
+   *
+   * Alternative {@link $http `$http`} params serializer that follows
+   * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic.
+   * The serializer will also sort the params alphabetically.
+   *
+   * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property:
+   *
+   * ```js
+   * $http({
+   *   url: myUrl,
+   *   method: 'GET',
+   *   params: myParams,
+   *   paramSerializer: '$httpParamSerializerJQLike'
+   * });
+   * ```
+   *
+   * It is also possible to set it as the default `paramSerializer` in the
+   * {@link $httpProvider#defaults `$httpProvider`}.
+   *
+   * Additionally, you can inject the serializer and use it explicitly, for example to serialize
+   * form data for submission:
+   *
+   * ```js
+   * .controller(function($http, $httpParamSerializerJQLike) {
+   *   //...
+   *
+   *   $http({
+   *     url: myUrl,
+   *     method: 'POST',
+   *     data: $httpParamSerializerJQLike(myData),
+   *     headers: {
+   *       'Content-Type': 'application/x-www-form-urlencoded'
+   *     }
+   *   });
+   *
+   * });
+   * ```
+   *
+   * */
+  this.$get = function() {
+    return function jQueryLikeParamSerializer(params) {
+      if (!params) return '';
+      var parts = [];
+      serialize(params, '', true);
+      return parts.join('&');
+
+      function serialize(toSerialize, prefix, topLevel) {
+        if (toSerialize === null || isUndefined(toSerialize)) return;
+        if (isArray(toSerialize)) {
+          forEach(toSerialize, function(value, index) {
+            serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']');
+          });
+        } else if (isObject(toSerialize) && !isDate(toSerialize)) {
+          forEachSorted(toSerialize, function(value, key) {
+            serialize(value, prefix +
+                (topLevel ? '' : '[') +
+                key +
+                (topLevel ? '' : ']'));
+          });
+        } else {
+          parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize)));
+        }
+      }
+    };
+  };
+}
 
 function defaultHttpResponseTransform(data, headers) {
   if (isString(data)) {
@@ -37,19 +160,24 @@ function isJsonLike(str) {
  * @returns {Object} Parsed headers as key value object
  */
 function parseHeaders(headers) {
-  var parsed = createMap(), key, val, i;
-
-  if (!headers) return parsed;
-
-  forEach(headers.split('\n'), function(line) {
-    i = line.indexOf(':');
-    key = lowercase(trim(line.substr(0, i)));
-    val = trim(line.substr(i + 1));
+  var parsed = createMap(), i;
 
+  function fillInParsed(key, val) {
     if (key) {
       parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
     }
-  });
+  }
+
+  if (isString(headers)) {
+    forEach(headers.split('\n'), function(line) {
+      i = line.indexOf(':');
+      fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1)));
+    });
+  } else if (isObject(headers)) {
+    forEach(headers, function(headerVal, headerKey) {
+      fillInParsed(lowercase(headerKey), trim(headerVal));
+    });
+  }
 
   return parsed;
 }
@@ -68,7 +196,7 @@ function parseHeaders(headers) {
  *   - if called with no arguments returns an object containing all headers.
  */
 function headersGetter(headers) {
-  var headersObj = isObject(headers) ? headers : undefined;
+  var headersObj;
 
   return function(name) {
     if (!headersObj) headersObj =  parseHeaders(headers);
@@ -131,7 +259,7 @@ function $HttpProvider() {
    *
    * - **`defaults.cache`** - {Object} - an object built with {@link ng.$cacheFactory `$cacheFactory`}
    * that will provide the cache for all requests who set their `cache` property to `true`.
-   * If you set the `default.cache = false` then only requests that specify their own custom
+   * If you set the `defaults.cache = false` then only requests that specify their own custom
    * cache object will be cached. See {@link $http#caching $http Caching} for more information.
    *
    * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token.
@@ -148,6 +276,12 @@ function $HttpProvider() {
    *     - **`defaults.headers.put`**
    *     - **`defaults.headers.patch`**
    *
+   *
+   * - **`defaults.paramSerializer`** - `{string|function(Object<string,string>):string}` - A function
+   *  used to the prepare string representation of request parameters (specified as an object).
+   *  If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}.
+   *  Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
+   *
    **/
   var defaults = this.defaults = {
     // transform incoming response data
@@ -169,7 +303,9 @@ function $HttpProvider() {
     },
 
     xsrfCookieName: 'XSRF-TOKEN',
-    xsrfHeaderName: 'X-XSRF-TOKEN'
+    xsrfHeaderName: 'X-XSRF-TOKEN',
+
+    paramSerializer: '$httpParamSerializer'
   };
 
   var useApplyAsync = false;
@@ -183,7 +319,7 @@ function $HttpProvider() {
    * significant performance improvement for bigger applications that make many HTTP requests
    * concurrently (common during application bootstrap).
    *
-   * Defaults to false. If no value is specifed, returns the current configured value.
+   * Defaults to false. If no value is specified, returns the current configured value.
    *
    * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred
    *    "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window
@@ -200,6 +336,30 @@ function $HttpProvider() {
     return useApplyAsync;
   };
 
+  var useLegacyPromise = true;
+  /**
+   * @ngdoc method
+   * @name $httpProvider#useLegacyPromiseExtensions
+   * @description
+   *
+   * Configure `$http` service to return promises without the shorthand methods `success` and `error`.
+   * This should be used to make sure that applications work without these methods.
+   *
+   * Defaults to false. If no value is specified, returns the current configured value.
+   *
+   * @param {boolean=} value If true, `$http` will return a normal promise without the `success` and `error` methods.
+   *
+   * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+   *    otherwise, returns the current configured value.
+   **/
+  this.useLegacyPromiseExtensions = function(value) {
+    if (isDefined(value)) {
+      useLegacyPromise = !!value;
+      return this;
+    }
+    return useLegacyPromise;
+  };
+
   /**
    * @ngdoc property
    * @name $httpProvider#interceptors
@@ -215,11 +375,17 @@ function $HttpProvider() {
    **/
   var interceptorFactories = this.interceptors = [];
 
-  this.$get = ['$httpBackend', '$browser', '$cacheFactory', '$rootScope', '$q', '$injector',
-      function($httpBackend, $browser, $cacheFactory, $rootScope, $q, $injector) {
+  this.$get = ['$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector',
+      function($httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector) {
 
     var defaultCache = $cacheFactory('$http');
 
+    /**
+     * Make sure that default param serializer is exposed as a function
+     */
+    defaults.paramSerializer = isString(defaults.paramSerializer) ?
+      $injector.get(defaults.paramSerializer) : defaults.paramSerializer;
+
     /**
      * Interceptors stored in reverse order. Inner interceptors before outer interceptors.
      * The reversal is needed so that we can build up the interception chain around the
@@ -260,17 +426,15 @@ function $HttpProvider() {
      *
      * ## General usage
      * The `$http` service is a function which takes a single argument — a configuration object —
-     * that is used to generate an HTTP request and returns  a {@link ng.$q promise}
-     * with two $http specific methods: `success` and `error`.
+     * that is used to generate an HTTP request and returns  a {@link ng.$q promise}.
      *
      * ```js
      *   // Simple GET request example :
      *   $http.get('/someUrl').
-     *     success(function(data, status, headers, config) {
+     *     then(function(response) {
      *       // this callback will be called asynchronously
      *       // when the response is available
-     *     }).
-     *     error(function(data, status, headers, config) {
+     *     }, function(response) {
      *       // called asynchronously if an error occurs
      *       // or server returns response with an error status.
      *     });
@@ -279,21 +443,23 @@ function $HttpProvider() {
      * ```js
      *   // Simple POST request example (passing data) :
      *   $http.post('/someUrl', {msg:'hello word!'}).
-     *     success(function(data, status, headers, config) {
+     *     then(function(response) {
      *       // this callback will be called asynchronously
      *       // when the response is available
-     *     }).
-     *     error(function(data, status, headers, config) {
+     *     }, function(response) {
      *       // called asynchronously if an error occurs
      *       // or server returns response with an error status.
      *     });
      * ```
      *
+     * The response object has these properties:
      *
-     * Since the returned value of calling the $http function is a `promise`, you can also use
-     * the `then` method to register callbacks, and these callbacks will receive a single argument –
-     * an object representing the response. See the API signature and type info below for more
-     * details.
+     *   - **data** – `{string|Object}` – The response body transformed with the transform
+     *     functions.
+     *   - **status** – `{number}` – HTTP status code of the response.
+     *   - **headers** – `{function([headerName])}` – Header getter function.
+     *   - **config** – `{Object}` – The configuration object that was used to generate the request.
+     *   - **statusText** – `{string}` – HTTP status text of the response.
      *
      * A response status code between 200 and 299 is considered a success status and
      * will result in the success callback being called. Note that if the response is a redirect,
@@ -317,8 +483,8 @@ function $HttpProvider() {
      * request data must be passed in for POST/PUT requests.
      *
      * ```js
-     *   $http.get('/someUrl').success(successCallback);
-     *   $http.post('/someUrl', data).success(successCallback);
+     *   $http.get('/someUrl').then(successCallback);
+     *   $http.post('/someUrl', data).then(successCallback);
      * ```
      *
      * Complete list of shortcut methods:
@@ -332,6 +498,14 @@ function $HttpProvider() {
      * - {@link ng.$http#patch $http.patch}
      *
      *
+     * ## Deprecation Notice
+     * <div class="alert alert-danger">
+     *   The `$http` legacy promise methods `success` and `error` have been deprecated.
+     *   Use the standard `then` method instead.
+     *   If {@link $httpProvider#useLegacyPromiseExtensions `$httpProvider.useLegacyPromiseExtensions`} is set to
+     *   `false` then these methods will throw {@link $http:legacy `$http/legacy`} error.
+     * </div>
+     *
      * ## Setting HTTP Headers
      *
      * The $http service will automatically add certain HTTP headers to all requests. These defaults
@@ -372,10 +546,10 @@ function $HttpProvider() {
      *  headers: {
      *    'Content-Type': undefined
      *  },
-     *  data: { test: 'test' },
+     *  data: { test: 'test' }
      * }
      *
-     * $http(req).success(function(){...}).error(function(){...});
+     * $http(req).then(function(){...}, function(){...});
      * ```
      *
      * ## Transforming Requests and Responses
@@ -604,15 +778,16 @@ function $HttpProvider() {
      * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time,
      * or the per-request config object.
      *
+     * In order to prevent collisions in environments where multiple Angular apps share the
+     * same domain or subdomain, we recommend that each application uses unique cookie name.
      *
      * @param {object} config Object describing the request to be made and how it should be
      *    processed. The object has following properties:
      *
      *    - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc)
      *    - **url** – `{string}` – Absolute or relative URL of the resource that is being requested.
-     *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be turned
-     *      to `?key1=value1&key2=value2` after the url. If the value is not a string, it will be
-     *      JSONified.
+     *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be serialized
+     *      with the `paramSerializer` and appended as GET parameters.
      *    - **data** – `{string|Object}` – Data to be sent as the request message data.
      *    - **headers** – `{Object}` – Map of strings or functions which return strings representing
      *      HTTP headers to send to the server. If the return value of a function is null, the
@@ -630,7 +805,14 @@ function $HttpProvider() {
      *      transform function or an array of such functions. The transform function takes the http
      *      response body, headers and status and returns its transformed (typically deserialized) version.
      *      See {@link ng.$http#overriding-the-default-transformations-per-request
-     *      Overriding the Default Transformations}
+     *      Overriding the Default TransformationjqLiks}
+     *    - **paramSerializer** - `{string|function(Object<string,string>):string}` - A function used to
+     *      prepare the string representation of request parameters (specified as an object).
+     *      If specified as string, it is interpreted as function registered with the
+     *      {@link $injector $injector}, which means you can create your own serializer
+     *      by registering it as a {@link auto.$provide#service service}.
+     *      The default serializer is the {@link $httpParamSerializer $httpParamSerializer};
+     *      alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike}
      *    - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
      *      GET request, otherwise if a cache instance built with
      *      {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
@@ -641,22 +823,11 @@ function $HttpProvider() {
      *      XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials)
      *      for more information.
      *    - **responseType** - `{string}` - see
-     *      [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
+     *      [XMLHttpRequest.responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype).
      *
-     * @returns {HttpPromise} Returns a {@link ng.$q promise} object with the
-     *   standard `then` method and two http specific methods: `success` and `error`. The `then`
-     *   method takes two arguments a success and an error callback which will be called with a
-     *   response object. The `success` and `error` methods take a single argument - a function that
-     *   will be called when the request succeeds or fails respectively. The arguments passed into
-     *   these functions are destructured representation of the response object passed into the
-     *   `then` method. The response object has these properties:
+     * @returns {HttpPromise} Returns a {@link ng.$q `Promise}` that will be resolved to a response object
+     *                        when the request succeeds or fails.
      *
-     *   - **data** – `{string|Object}` – The response body transformed with the transform
-     *     functions.
-     *   - **status** – `{number}` – HTTP status code of the response.
-     *   - **headers** – `{function([headerName])}` – Header getter function.
-     *   - **config** – `{Object}` – The configuration object that was used to generate the request.
-     *   - **statusText** – `{string}` – HTTP status text of the response.
      *
      * @property {Array.<Object>} pendingRequests Array of config objects for currently pending
      *   requests. This is primarily meant to be used for debugging purposes.
@@ -666,11 +837,11 @@ function $HttpProvider() {
 <example module="httpExample">
 <file name="index.html">
   <div ng-controller="FetchController">
-    <select ng-model="method">
+    <select ng-model="method" aria-label="Request method">
       <option>GET</option>
       <option>JSONP</option>
     </select>
-    <input type="text" ng-model="url" size="80"/>
+    <input type="text" ng-model="url" size="80" aria-label="URL" />
     <button id="fetchbtn" ng-click="fetch()">fetch</button><br>
     <button id="samplegetbtn" ng-click="updateModel('GET', 'http-hello.html')">Sample GET</button>
     <button id="samplejsonpbtn"
@@ -698,13 +869,12 @@ function $HttpProvider() {
           $scope.response = null;
 
           $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
-            success(function(data, status) {
-              $scope.status = status;
-              $scope.data = data;
-            }).
-            error(function(data, status) {
-              $scope.data = data || "Request failed";
-              $scope.status = status;
+            then(function(response) {
+              $scope.status = response.status;
+              $scope.data = response.data;
+            }, function(response) {
+              $scope.data = response.data || "Request failed";
+              $scope.status = response.status;
           });
         };
 
@@ -759,11 +929,14 @@ function $HttpProvider() {
       var config = extend({
         method: 'get',
         transformRequest: defaults.transformRequest,
-        transformResponse: defaults.transformResponse
+        transformResponse: defaults.transformResponse,
+        paramSerializer: defaults.paramSerializer
       }, requestConfig);
 
       config.headers = mergeHeaders(requestConfig);
       config.method = uppercase(config.method);
+      config.paramSerializer = isString(config.paramSerializer) ?
+        $injector.get(config.paramSerializer) : config.paramSerializer;
 
       var serverRequest = function(config) {
         var headers = config.headers;
@@ -806,19 +979,28 @@ function $HttpProvider() {
         promise = promise.then(thenFn, rejectFn);
       }
 
-      promise.success = function(fn) {
-        promise.then(function(response) {
-          fn(response.data, response.status, response.headers, config);
-        });
-        return promise;
-      };
+      if (useLegacyPromise) {
+        promise.success = function(fn) {
+          assertArgFn(fn, 'fn');
 
-      promise.error = function(fn) {
-        promise.then(null, function(response) {
-          fn(response.data, response.status, response.headers, config);
-        });
-        return promise;
-      };
+          promise.then(function(response) {
+            fn(response.data, response.status, response.headers, config);
+          });
+          return promise;
+        };
+
+        promise.error = function(fn) {
+          assertArgFn(fn, 'fn');
+
+          promise.then(null, function(response) {
+            fn(response.data, response.status, response.headers, config);
+          });
+          return promise;
+        };
+      } else {
+        promise.success = $httpMinErrLegacyFn('success');
+        promise.error = $httpMinErrLegacyFn('error');
+      }
 
       return promise;
 
@@ -989,7 +1171,7 @@ function $HttpProvider() {
     function createShortMethods(names) {
       forEach(arguments, function(name) {
         $http[name] = function(url, config) {
-          return $http(extend(config || {}, {
+          return $http(extend({}, config || {}, {
             method: name,
             url: url
           }));
@@ -1001,7 +1183,7 @@ function $HttpProvider() {
     function createShortMethodsWithData(name) {
       forEach(arguments, function(name) {
         $http[name] = function(url, data, config) {
-          return $http(extend(config || {}, {
+          return $http(extend({}, config || {}, {
             method: name,
             url: url,
             data: data
@@ -1023,7 +1205,7 @@ function $HttpProvider() {
           cache,
           cachedResp,
           reqHeaders = config.headers,
-          url = buildUrl(config.url, config.params);
+          url = buildUrl(config.url, config.paramSerializer(config.params));
 
       $http.pendingRequests.push(config);
       promise.then(removePendingReq, removePendingReq);
@@ -1061,7 +1243,7 @@ function $HttpProvider() {
       // send the request to the backend
       if (isUndefined(cachedResp)) {
         var xsrfValue = urlIsSameOrigin(config.url)
-            ? $browser.cookies()[config.xsrfCookieName || defaults.xsrfCookieName]
+            ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName]
             : undefined;
         if (xsrfValue) {
           reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
@@ -1130,27 +1312,9 @@ function $HttpProvider() {
     }
 
 
-    function buildUrl(url, params) {
-      if (!params) return url;
-      var parts = [];
-      forEachSorted(params, function(value, key) {
-        if (value === null || isUndefined(value)) return;
-        if (!isArray(value)) value = [value];
-
-        forEach(value, function(v) {
-          if (isObject(v)) {
-            if (isDate(v)) {
-              v = v.toISOString();
-            } else {
-              v = toJson(v);
-            }
-          }
-          parts.push(encodeUriQuery(key) + '=' +
-                     encodeUriQuery(v));
-        });
-      });
-      if (parts.length > 0) {
-        url += ((url.indexOf('?') == -1) ? '?' : '&') + parts.join('&');
+    function buildUrl(url, serializedParams) {
+      if (serializedParams.length > 0) {
+        url += ((url.indexOf('?') == -1) ? '?' : '&') + serializedParams;
       }
       return url;
     }
diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js
index 5ba78b749932..91fbb7fb7e16 100644
--- a/src/ng/httpBackend.js
+++ b/src/ng/httpBackend.js
@@ -58,7 +58,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
       xhr.onload = function requestLoaded() {
         var statusText = xhr.statusText || '';
 
-        // responseText is the old-school way of retrieving response (supported by IE8 & 9)
+        // responseText is the old-school way of retrieving response (supported by IE9)
         // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
         var response = ('response' in xhr) ? xhr.response : xhr.responseText;
 
@@ -109,7 +109,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
         }
       }
 
-      xhr.send(post || null);
+      xhr.send(post);
     }
 
     if (timeout > 0) {
@@ -137,7 +137,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
   };
 
   function jsonpReq(url, callbackId, done) {
-    // we can't use jQuery/jqLite here because jQuery does crazy shit with script elements, e.g.:
+    // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
     // - fetches local scripts via XHR and evals them
     // - adds and immediately removes script elements from the document
     var script = rawDocument.createElement('script'), callback = null;
diff --git a/src/ng/interpolate.js b/src/ng/interpolate.js
index 9b2651b63e17..05dd57af552c 100644
--- a/src/ng/interpolate.js
+++ b/src/ng/interpolate.js
@@ -1,6 +1,16 @@
 'use strict';
 
-var $interpolateMinErr = minErr('$interpolate');
+var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate');
+$interpolateMinErr.throwNoconcat = function(text) {
+  throw $interpolateMinErr('noconcat',
+      "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
+      "interpolations that concatenate multiple expressions when a trusted value is " +
+      "required.  See http://docs.angularjs.org/api/ng.$sce", text);
+};
+
+$interpolateMinErr.interr = function(text, err) {
+  return $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, err.toString());
+};
 
 /**
  * @ngdoc provider
@@ -244,10 +254,7 @@ function $InterpolateProvider() {
       // make it obvious that you bound the value to some user controlled value.  This helps reduce
       // the load when auditing for XSS issues.
       if (trustedContext && concat.length > 1) {
-          throw $interpolateMinErr('noconcat',
-              "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
-              "interpolations that concatenate multiple expressions when a trusted value is " +
-              "required.  See http://docs.angularjs.org/api/ng.$sce", text);
+          $interpolateMinErr.throwNoconcat(text);
       }
 
       if (!mustHaveExpression || expressions.length) {
@@ -277,16 +284,14 @@ function $InterpolateProvider() {
 
               return compute(values);
             } catch (err) {
-              var newErr = $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text,
-                  err.toString());
-              $exceptionHandler(newErr);
+              $exceptionHandler($interpolateMinErr.interr(text, err));
             }
 
           }, {
           // all of these properties are undocumented for now
           exp: text, //just for compatibility with regular watchers created via $watch
           expressions: expressions,
-          $$watchDelegate: function(scope, listener, objectEquality) {
+          $$watchDelegate: function(scope, listener) {
             var lastValue;
             return scope.$watchGroup(parseFns, function interpolateFnWatcher(values, oldValues) {
               var currValue = compute(values);
@@ -294,7 +299,7 @@ function $InterpolateProvider() {
                 listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope);
               }
               lastValue = currValue;
-            }, objectEquality);
+            });
           }
         });
       }
@@ -304,9 +309,7 @@ function $InterpolateProvider() {
           value = getValue(value);
           return allOrNothing && !isDefined(value) ? value : stringify(value);
         } catch (err) {
-          var newErr = $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text,
-            err.toString());
-          $exceptionHandler(newErr);
+          $exceptionHandler($interpolateMinErr.interr(text, err));
         }
       }
     }
diff --git a/src/ng/interval.js b/src/ng/interval.js
index 1afaec797041..1e58981a91e5 100644
--- a/src/ng/interval.js
+++ b/src/ng/interval.js
@@ -39,6 +39,7 @@ function $IntervalProvider() {
       *   indefinitely.
       * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
       *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+      * @param {...*=} Pass additional parameters to the executed function.
       * @returns {promise} A promise which will be notified on each iteration.
       *
       * @example
@@ -117,7 +118,7 @@ function $IntervalProvider() {
       *
       *   <div>
       *     <div ng-controller="ExampleController">
-      *       Date format: <input ng-model="format"> <hr/>
+      *       <label>Date format: <input ng-model="format"></label> <hr/>
       *       Current time is: <span my-current-time="format"></span>
       *       <hr/>
       *       Blood 1 : <font color='red'>{{blood_1}}</font>
@@ -132,7 +133,9 @@ function $IntervalProvider() {
       * </example>
       */
     function interval(fn, delay, count, invokeApply) {
-      var setInterval = $window.setInterval,
+      var hasParams = arguments.length > 4,
+          args = hasParams ? sliceArgs(arguments, 4) : [],
+          setInterval = $window.setInterval,
           clearInterval = $window.clearInterval,
           iteration = 0,
           skipApply = (isDefined(invokeApply) && !invokeApply),
@@ -141,7 +144,9 @@ function $IntervalProvider() {
 
       count = isDefined(count) ? count : 0;
 
-      promise.then(null, null, fn);
+      promise.then(null, null, (!hasParams) ? fn : function() {
+        fn.apply(null, args);
+      });
 
       promise.$$intervalId = setInterval(function tick() {
         deferred.notify(iteration++);
diff --git a/src/ng/locale.js b/src/ng/locale.js
index fd3d5c43e9ae..ebe175f43132 100644
--- a/src/ng/locale.js
+++ b/src/ng/locale.js
@@ -10,64 +10,4 @@
  *
  * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
  */
-function $LocaleProvider() {
-  this.$get = function() {
-    return {
-      id: 'en-us',
 
-      NUMBER_FORMATS: {
-        DECIMAL_SEP: '.',
-        GROUP_SEP: ',',
-        PATTERNS: [
-          { // Decimal Pattern
-            minInt: 1,
-            minFrac: 0,
-            maxFrac: 3,
-            posPre: '',
-            posSuf: '',
-            negPre: '-',
-            negSuf: '',
-            gSize: 3,
-            lgSize: 3
-          },{ //Currency Pattern
-            minInt: 1,
-            minFrac: 2,
-            maxFrac: 2,
-            posPre: '\u00A4',
-            posSuf: '',
-            negPre: '(\u00A4',
-            negSuf: ')',
-            gSize: 3,
-            lgSize: 3
-          }
-        ],
-        CURRENCY_SYM: '$'
-      },
-
-      DATETIME_FORMATS: {
-        MONTH:
-            'January,February,March,April,May,June,July,August,September,October,November,December'
-            .split(','),
-        SHORTMONTH:  'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','),
-        DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','),
-        SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','),
-        AMPMS: ['AM','PM'],
-        medium: 'MMM d, y h:mm:ss a',
-        'short': 'M/d/yy h:mm a',
-        fullDate: 'EEEE, MMMM d, y',
-        longDate: 'MMMM d, y',
-        mediumDate: 'MMM d, y',
-        shortDate: 'M/d/yy',
-        mediumTime: 'h:mm:ss a',
-        shortTime: 'h:mm a'
-      },
-
-      pluralCat: function(num) {
-        if (num === 1) {
-          return 'one';
-        }
-        return 'other';
-      }
-    };
-  };
-}
diff --git a/src/ng/location.js b/src/ng/location.js
index dfe22cd000cd..0412f3d9183f 100644
--- a/src/ng/location.js
+++ b/src/ng/location.js
@@ -89,12 +89,12 @@ function serverBase(url) {
  *
  * @constructor
  * @param {string} appBase application base URL
+ * @param {string} appBaseNoFile application base URL stripped of any filename
  * @param {string} basePrefix url path prefix
  */
-function LocationHtml5Url(appBase, basePrefix) {
+function LocationHtml5Url(appBase, appBaseNoFile, basePrefix) {
   this.$$html5 = true;
   basePrefix = basePrefix || '';
-  var appBaseNoFile = stripFile(appBase);
   parseAbsoluteUrl(appBase, this);
 
 
@@ -168,10 +168,10 @@ function LocationHtml5Url(appBase, basePrefix) {
  *
  * @constructor
  * @param {string} appBase application base URL
+ * @param {string} appBaseNoFile application base URL stripped of any filename
  * @param {string} hashPrefix hashbang prefix
  */
-function LocationHashbangUrl(appBase, hashPrefix) {
-  var appBaseNoFile = stripFile(appBase);
+function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) {
 
   parseAbsoluteUrl(appBase, this);
 
@@ -185,7 +185,7 @@ function LocationHashbangUrl(appBase, hashPrefix) {
     var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url);
     var withoutHashUrl;
 
-    if (withoutBaseUrl.charAt(0) === '#') {
+    if (!isUndefined(withoutBaseUrl) && withoutBaseUrl.charAt(0) === '#') {
 
       // The rest of the url starts with a hash so we have
       // got either a hashbang path or a plain hash fragment
@@ -199,7 +199,15 @@ function LocationHashbangUrl(appBase, hashPrefix) {
       // There was no hashbang path nor hash fragment:
       // If we are in HTML5 mode we use what is left as the path;
       // Otherwise we ignore what is left
-      withoutHashUrl = this.$$html5 ? withoutBaseUrl : '';
+      if (this.$$html5) {
+        withoutHashUrl = withoutBaseUrl;
+      } else {
+        withoutHashUrl = '';
+        if (isUndefined(withoutBaseUrl)) {
+          appBase = url;
+          this.replace();
+        }
+      }
     }
 
     parseAppUrl(withoutHashUrl, this);
@@ -272,14 +280,13 @@ function LocationHashbangUrl(appBase, hashPrefix) {
  *
  * @constructor
  * @param {string} appBase application base URL
+ * @param {string} appBaseNoFile application base URL stripped of any filename
  * @param {string} hashPrefix hashbang prefix
  */
-function LocationHashbangInHtml5Url(appBase, hashPrefix) {
+function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
   this.$$html5 = true;
   LocationHashbangUrl.apply(this, arguments);
 
-  var appBaseNoFile = stripFile(appBase);
-
   this.$$parseLinkUrl = function(url, relHref) {
     if (relHref && relHref[0] === '#') {
       // special case for links to hash fragments:
@@ -309,7 +316,7 @@ function LocationHashbangInHtml5Url(appBase, hashPrefix) {
         hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
 
     this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
-    // include hashPrefix in $$absUrl when $$url is empty so IE8 & 9 do not reload page because of removal of '#'
+    // include hashPrefix in $$absUrl when $$url is empty so IE9 does not reload page because of removal of '#'
     this.$$absUrl = appBase + hashPrefix + this.$$url;
   };
 
@@ -414,11 +421,19 @@ var locationPrototype = {
    *
    * Return host of current url.
    *
+   * Note: compared to the non-angular version `location.host` which returns `hostname:port`, this returns the `hostname` portion only.
+   *
    *
    * ```js
    * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
    * var host = $location.host();
    * // => "example.com"
+   *
+   * // given url http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo
+   * host = $location.host();
+   * // => "example.com"
+   * host = location.host;
+   * // => "example.com:8080"
    * ```
    *
    * @return {string} host of current url.
@@ -810,7 +825,9 @@ function $LocationProvider() {
       appBase = stripHash(initialUrl);
       LocationMode = LocationHashbangUrl;
     }
-    $location = new LocationMode(appBase, '#' + hashPrefix);
+    var appBaseNoFile = stripFile(appBase);
+
+    $location = new LocationMode(appBase, appBaseNoFile, '#' + hashPrefix);
     $location.$$parseLinkUrl(initialUrl, initialUrl);
 
     $location.$$state = $browser.state();
@@ -890,6 +907,13 @@ function $LocationProvider() {
 
     // update $location when $browser url changes
     $browser.onUrlChange(function(newUrl, newState) {
+
+      if (isUndefined(beginsWith(appBaseNoFile, newUrl))) {
+        // If we are navigating outside of the app then force a reload
+        $window.location.href = newUrl;
+        return;
+      }
+
       $rootScope.$evalAsync(function() {
         var oldUrl = $location.absUrl();
         var oldState = $location.$$state;
diff --git a/src/ng/log.js b/src/ng/log.js
index 546056bd17a7..6d4d18105538 100644
--- a/src/ng/log.js
+++ b/src/ng/log.js
@@ -26,12 +26,13 @@
      <file name="index.html">
        <div ng-controller="LogController">
          <p>Reload this page with open console, enter text and hit the log button...</p>
-         Message:
-         <input type="text" ng-model="message"/>
+         <label>Message:
+         <input type="text" ng-model="message" /></label>
          <button ng-click="$log.log(message)">log</button>
          <button ng-click="$log.warn(message)">warn</button>
          <button ng-click="$log.info(message)">info</button>
          <button ng-click="$log.error(message)">error</button>
+         <button ng-click="$log.debug(message)">debug</button>
        </div>
      </file>
    </example>
diff --git a/src/ng/parse.js b/src/ng/parse.js
index 54cad090a5b8..b3e5c5642962 100644
--- a/src/ng/parse.js
+++ b/src/ng/parse.js
@@ -1,5 +1,16 @@
 'use strict';
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 var $parseMinErr = minErr('$parse');
 
 // Sandboxing Angular Expressions
@@ -773,7 +784,7 @@ ASTCompiler.prototype = {
       self.state.computing = fnKey;
       var intoId = self.nextId();
       self.recurse(watch, intoId);
-      self.return(intoId);
+      self.return_(intoId);
       self.state.inputs.push(fnKey);
       watch.watchId = key;
     });
@@ -860,7 +871,7 @@ ASTCompiler.prototype = {
     recursionFn = recursionFn || noop;
     if (!skipWatchIdCheck && isDefined(ast.watchId)) {
       intoId = intoId || this.nextId();
-      this.if('i',
+      this.if_('i',
         this.lazyAssign(intoId, this.computedMember('i', ast.watchId)),
         this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true)
       );
@@ -873,7 +884,7 @@ ASTCompiler.prototype = {
         if (pos !== ast.body.length - 1) {
           self.current().body.push(right, ';');
         } else {
-          self.return(right);
+          self.return_(right);
         }
       });
       break;
@@ -904,13 +915,13 @@ ASTCompiler.prototype = {
     case AST.LogicalExpression:
       intoId = intoId || this.nextId();
       self.recurse(ast.left, intoId);
-      self.if(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId));
+      self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId));
       recursionFn(intoId);
       break;
     case AST.ConditionalExpression:
       intoId = intoId || this.nextId();
       self.recurse(ast.test, intoId);
-      self.if(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId));
+      self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId));
       recursionFn(intoId);
       break;
     case AST.Identifier:
@@ -921,11 +932,11 @@ ASTCompiler.prototype = {
         nameId.name = ast.name;
       }
       ensureSafeMemberName(ast.name);
-      self.if(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)),
+      self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)),
         function() {
-          self.if(self.stage === 'inputs' || 's', function() {
+          self.if_(self.stage === 'inputs' || 's', function() {
             if (create && create !== 1) {
-              self.if(
+              self.if_(
                 self.not(self.nonComputedMember('s', ast.name)),
                 self.lazyAssign(self.nonComputedMember('s', ast.name), '{}'));
             }
@@ -942,13 +953,13 @@ ASTCompiler.prototype = {
       left = nameId && (nameId.context = this.nextId()) || this.nextId();
       intoId = intoId || this.nextId();
       self.recurse(ast.object, left, undefined, function() {
-        self.if(self.notNull(left), function() {
+        self.if_(self.notNull(left), function() {
           if (ast.computed) {
             right = self.nextId();
             self.recurse(ast.property, right);
             self.addEnsureSafeMemberName(right);
             if (create && create !== 1) {
-              self.if(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
+              self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
             }
             expression = self.ensureSafeObject(self.computedMember(left, right));
             self.assign(intoId, expression);
@@ -959,7 +970,7 @@ ASTCompiler.prototype = {
           } else {
             ensureSafeMemberName(ast.property.name);
             if (create && create !== 1) {
-              self.if(self.not(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
+              self.if_(self.not(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
             }
             expression = self.nonComputedMember(left, ast.property.name);
             if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.property.name)) {
@@ -971,8 +982,10 @@ ASTCompiler.prototype = {
               nameId.name = ast.property.name;
             }
           }
-          recursionFn(intoId);
+        }, function() {
+          self.assign(intoId, 'undefined');
         });
+        recursionFn(intoId);
       }, !!create);
       break;
     case AST.CallExpression:
@@ -993,7 +1006,7 @@ ASTCompiler.prototype = {
         left = {};
         args = [];
         self.recurse(ast.callee, right, left, function() {
-          self.if(self.notNull(right), function() {
+          self.if_(self.notNull(right), function() {
             self.addEnsureSafeFunction(right);
             forEach(ast.arguments, function(expr) {
               self.recurse(expr, self.nextId(), undefined, function(argument) {
@@ -1010,8 +1023,10 @@ ASTCompiler.prototype = {
             }
             expression = self.ensureSafeObject(expression);
             self.assign(intoId, expression);
-            recursionFn(intoId);
+          }, function() {
+            self.assign(intoId, 'undefined');
           });
+          recursionFn(intoId);
         });
       }
       break;
@@ -1022,7 +1037,7 @@ ASTCompiler.prototype = {
         throw $parseMinErr('lval', 'Trying to assing a value to a non l-value');
       }
       this.recurse(ast.left, undefined, left, function() {
-        self.if(self.notNull(left.context), function() {
+        self.if_(self.notNull(left.context), function() {
           self.recurse(ast.right, right);
           self.addEnsureSafeObject(self.member(left.context, left.name, left.computed));
           expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
@@ -1097,11 +1112,11 @@ ASTCompiler.prototype = {
     return 'plus(' + left + ',' + right + ')';
   },
 
-  'return': function(id) {
+  return_: function(id) {
     this.current().body.push('return ', id, ';');
   },
 
-  'if': function(test, alternate, consequent) {
+  if_: function(test, alternate, consequent) {
     if (test === true) {
       alternate();
     } else {
@@ -1595,29 +1610,6 @@ Parser.prototype = {
   }
 };
 
-//////////////////////////////////////////////////
-// Parser helper functions
-//////////////////////////////////////////////////
-
-function setter(obj, path, setValue, fullExp) {
-  ensureSafeObject(obj, fullExp);
-
-  var element = path.split('.'), key;
-  for (var i = 0; element.length > 1; i++) {
-    key = ensureSafeMemberName(element.shift(), fullExp);
-    var propertyObj = ensureSafeObject(obj[key], fullExp);
-    if (!propertyObj) {
-      propertyObj = {};
-      obj[key] = propertyObj;
-    }
-    obj = propertyObj;
-  }
-  key = ensureSafeMemberName(element.shift(), fullExp);
-  ensureSafeObject(obj[key], fullExp);
-  obj[key] = setValue;
-  return setValue;
-}
-
 var getterFnCacheDefault = createMap();
 var getterFnCacheExpensive = createMap();
 
@@ -1686,13 +1678,14 @@ function $ParseProvider() {
   var cacheDefault = createMap();
   var cacheExpensive = createMap();
 
-  this.$get = ['$filter', '$sniffer', function($filter, $sniffer) {
+  this.$get = ['$filter', function($filter) {
+    var noUnsafeEval = csp().noUnsafeEval;
     var $parseOptions = {
-          csp: $sniffer.csp,
+          csp: noUnsafeEval,
           expensiveChecks: false
         },
         $parseOptionsExpensive = {
-          csp: $sniffer.csp,
+          csp: noUnsafeEval,
           expensiveChecks: true
         };
 
diff --git a/src/ng/q.js b/src/ng/q.js
index 3390441db613..8713ecb705a2 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -140,9 +140,11 @@
  *   provide a progress indication, before the promise is resolved or rejected.
  *
  *   This method *returns a new promise* which is resolved or rejected via the return value of the
- *   `successCallback`, `errorCallback`. It also notifies via the return value of the
- *   `notifyCallback` method. The promise cannot be resolved or rejected from the notifyCallback
- *   method.
+ *   `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved
+ *   with the value which is resolved in that promise using
+ *   [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
+ *   It also notifies via the return value of the `notifyCallback` method. The promise cannot be
+ *   resolved or rejected from the notifyCallback method.
  *
  * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
  *
@@ -270,7 +272,7 @@ function qFactory(nextTick, exceptionHandler) {
     this.$$state = { status: 0 };
   }
 
-  Promise.prototype = {
+  extend(Promise.prototype, {
     then: function(onFulfilled, onRejected, progressBack) {
       var result = new Deferred();
 
@@ -292,7 +294,7 @@ function qFactory(nextTick, exceptionHandler) {
         return handleCallback(error, false, callback);
       }, progressBack);
     }
-  };
+  });
 
   //Faster, more basic than angular.bind http://jsperf.com/angular-bind-vs-custom-vs-native
   function simpleBind(context, fn) {
@@ -339,7 +341,7 @@ function qFactory(nextTick, exceptionHandler) {
     this.notify = simpleBind(this, this.notify);
   }
 
-  Deferred.prototype = {
+  extend(Deferred.prototype, {
     resolve: function(val) {
       if (this.promise.$$state.status) return;
       if (val === this.promise) {
@@ -402,7 +404,7 @@ function qFactory(nextTick, exceptionHandler) {
         });
       }
     }
-  };
+  });
 
   /**
    * @ngdoc method
@@ -485,6 +487,9 @@ function qFactory(nextTick, exceptionHandler) {
    * the promise comes from a source that can't be trusted.
    *
    * @param {*} value Value or a promise
+   * @param {Function=} successCallback
+   * @param {Function=} errorCallback
+   * @param {Function=} progressCallback
    * @returns {Promise} Returns a promise of the passed value or promise
    */
 
@@ -495,6 +500,22 @@ function qFactory(nextTick, exceptionHandler) {
     return result.promise.then(callback, errback, progressBack);
   };
 
+  /**
+   * @ngdoc method
+   * @name $q#resolve
+   * @kind function
+   *
+   * @description
+   * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6.
+   *
+   * @param {*} value Value or a promise
+   * @param {Function=} successCallback
+   * @param {Function=} errorCallback
+   * @param {Function=} progressCallback
+   * @returns {Promise} Returns a promise of the passed value or promise
+   */
+  var resolve = when;
+
   /**
    * @ngdoc method
    * @name $q#all
@@ -563,6 +584,7 @@ function qFactory(nextTick, exceptionHandler) {
   $Q.defer = defer;
   $Q.reject = reject;
   $Q.when = when;
+  $Q.resolve = resolve;
   $Q.all = all;
 
   return $Q;
diff --git a/src/ng/raf.js b/src/ng/raf.js
index f8bf0839b908..a487b006f606 100644
--- a/src/ng/raf.js
+++ b/src/ng/raf.js
@@ -10,7 +10,7 @@ function $$RAFProvider() { //rAF
                                $window.webkitCancelRequestAnimationFrame;
 
     var rafSupported = !!requestAnimationFrame;
-    var raf = rafSupported
+    var rafFn = rafSupported
       ? function(fn) {
           var id = requestAnimationFrame(fn);
           return function() {
@@ -24,8 +24,46 @@ function $$RAFProvider() { //rAF
           };
         };
 
-    raf.supported = rafSupported;
+    queueFn.supported = rafSupported;
 
-    return raf;
+    var cancelLastRAF;
+    var taskCount = 0;
+    var taskQueue = [];
+    return queueFn;
+
+    function flush() {
+      for (var i = 0; i < taskQueue.length; i++) {
+        var task = taskQueue[i];
+        if (task) {
+          taskQueue[i] = null;
+          task();
+        }
+      }
+      taskCount = taskQueue.length = 0;
+    }
+
+    function queueFn(asyncFn) {
+      var index = taskQueue.length;
+
+      taskCount++;
+      taskQueue.push(asyncFn);
+
+      if (index === 0) {
+        cancelLastRAF = rafFn(flush);
+      }
+
+      return function cancelQueueFn() {
+        if (index >= 0) {
+          taskQueue[index] = null;
+          index = null;
+
+          if (--taskCount === 0 && cancelLastRAF) {
+            cancelLastRAF();
+            cancelLastRAF = null;
+            taskQueue.length = 0;
+          }
+        }
+      };
+    }
   }];
 }
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
index 71a82dcda547..3bbabfb7cf6c 100644
--- a/src/ng/rootScope.js
+++ b/src/ng/rootScope.js
@@ -80,9 +80,27 @@ function $RootScopeProvider() {
     return TTL;
   };
 
+  function createChildScopeClass(parent) {
+    function ChildScope() {
+      this.$$watchers = this.$$nextSibling =
+          this.$$childHead = this.$$childTail = null;
+      this.$$listeners = {};
+      this.$$listenerCount = {};
+      this.$$watchersCount = 0;
+      this.$id = nextUid();
+      this.$$ChildScope = null;
+    }
+    ChildScope.prototype = parent;
+    return ChildScope;
+  }
+
   this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser',
       function($injector, $exceptionHandler, $parse, $browser) {
 
+    function destroyChildScope($event) {
+        $event.currentScope.$$destroyed = true;
+    }
+
     /**
      * @ngdoc type
      * @name $rootScope.Scope
@@ -91,12 +109,9 @@ function $RootScopeProvider() {
      * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
      * {@link auto.$injector $injector}. Child scopes are created using the
      * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
-     * compiled HTML template is executed.)
+     * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for
+     * an in-depth introduction and usage examples.
      *
-     * Here is a simple scope snippet to show how you can interact with the scope.
-     * ```html
-     * <file src="./test/ng/rootScopeSpec.js" tag="docs1" />
-     * ```
      *
      * # Inheritance
      * A scope can inherit from a parent scope, as in this example:
@@ -206,16 +221,7 @@ function $RootScopeProvider() {
           // Only create a child scope class if somebody asks for one,
           // but cache it to allow the VM to optimize lookups.
           if (!this.$$ChildScope) {
-            this.$$ChildScope = function ChildScope() {
-              this.$$watchers = this.$$nextSibling =
-                  this.$$childHead = this.$$childTail = null;
-              this.$$listeners = {};
-              this.$$listenerCount = {};
-              this.$$watchersCount = 0;
-              this.$id = nextUid();
-              this.$$ChildScope = null;
-            };
-            this.$$ChildScope.prototype = this;
+            this.$$ChildScope = createChildScopeClass(this);
           }
           child = new this.$$ChildScope();
         }
@@ -233,13 +239,9 @@ function $RootScopeProvider() {
         // prototypically. In all other cases, this property needs to be set
         // when the parent scope is destroyed.
         // The listener needs to be added after the parent is set
-        if (isolate || parent != this) child.$on('$destroy', destroyChild);
+        if (isolate || parent != this) child.$on('$destroy', destroyChildScope);
 
         return child;
-
-        function destroyChild() {
-          child.$$destroyed = true;
-        }
       },
 
       /**
@@ -271,9 +273,9 @@ function $RootScopeProvider() {
        *
        *
        * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
-       * you can register a `watchExpression` function with no `listener`. (Since `watchExpression`
-       * can execute multiple times per {@link ng.$rootScope.Scope#$digest $digest} cycle when a
-       * change is detected, be prepared for multiple calls to your listener.)
+       * you can register a `watchExpression` function with no `listener`. (Be prepared for
+       * multiple calls to your `watchExpression` because it will execute multiple times in a
+       * single {@link ng.$rootScope.Scope#$digest $digest} cycle if a change is detected.)
        *
        * After a watcher is registered with the scope, the `listener` fn is called asynchronously
        * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
@@ -866,13 +868,17 @@ function $RootScopeProvider() {
        * clean up DOM bindings before an element is removed from the DOM.
        */
       $destroy: function() {
-        // we can't destroy the root scope or a scope that has been already destroyed
+        // We can't destroy a scope that has been already destroyed.
         if (this.$$destroyed) return;
         var parent = this.$parent;
 
         this.$broadcast('$destroy');
         this.$$destroyed = true;
-        if (this === $rootScope) return;
+
+        if (this === $rootScope) {
+          //Remove handlers attached to window when $rootScope is removed
+          $browser.$$applicationDestroyed();
+        }
 
         incrementWatchersCount(this, -this.$$watchersCount);
         for (var eventName in this.$$listenerCount) {
@@ -881,8 +887,8 @@ function $RootScopeProvider() {
 
         // sever all the references to parent scopes (after this cleanup, the current scope should
         // not be retained by any of our references and should be eligible for garbage collection)
-        if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
-        if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
+        if (parent && parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
+        if (parent && parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
         if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
         if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
 
@@ -1031,11 +1037,14 @@ function $RootScopeProvider() {
       $apply: function(expr) {
         try {
           beginPhase('$apply');
-          return this.$eval(expr);
+          try {
+            return this.$eval(expr);
+          } finally {
+            clearPhase();
+          }
         } catch (e) {
           $exceptionHandler(e);
         } finally {
-          clearPhase();
           try {
             $rootScope.$digest();
           } catch (e) {
diff --git a/src/ng/sce.js b/src/ng/sce.js
index 67be4997fb8f..0c9d4a445a21 100644
--- a/src/ng/sce.js
+++ b/src/ng/sce.js
@@ -1,5 +1,16 @@
 'use strict';
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 var $sceMinErr = minErr('$sce');
 
 var SCE_CONTEXTS = {
@@ -413,7 +424,7 @@ function $SceDelegateProvider() {
  * Here's an example of a binding in a privileged context:
  *
  * ```
- * <input ng-model="userHtml">
+ * <input ng-model="userHtml" aria-label="User input">
  * <div ng-bind-html="userHtml"></div>
  * ```
  *
@@ -534,7 +545,7 @@ function $SceDelegateProvider() {
  *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and ';'.  It's a useful wildcard for use
  *      in a whitelist.
  *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
- *      not appropriate to use in for a scheme, domain, etc. as it would match too much.  (e.g.
+ *      appropriate for use in a scheme, domain, etc. as it would match too much.  (e.g.
  *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
  *      not have been the intention.)  Its usage at the very end of the path is ok.  (e.g.
  *      http://foo.example.com/templates/**).
@@ -542,11 +553,11 @@ function $SceDelegateProvider() {
  *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
  *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
  *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
- *      have good test coverage.).  For instance, the use of `.` in the regex is correct only in a
+ *      have good test coverage).  For instance, the use of `.` in the regex is correct only in a
  *      small number of cases.  A `.` character in the regex used when matching the scheme or a
  *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
  *      is highly recommended to use the string patterns and only fall back to regular expressions
- *      if they as a last resort.
+ *      as a last resort.
  *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
  *      matched against the **entire** *normalized / absolute URL* of the resource being tested
  *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
@@ -556,7 +567,7 @@ function $SceDelegateProvider() {
  *      remember to escape your regular expression (and be aware that you might need more than
  *      one level of escaping depending on your templating engine and the way you interpolated
  *      the value.)  Do make use of your platform's escaping mechanism as it might be good
- *      enough before coding your own.  e.g. Ruby has
+ *      enough before coding your own.  E.g. Ruby has
  *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
  *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
  *      Javascript lacks a similar built in function for escaping.  Take a look at Google
@@ -797,7 +808,7 @@ function $SceProvider() {
      * escaping.
      *
      * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
-     *   resource_url, html, js and css.
+     *   resourceUrl, html, js and css.
      * @param {*} value The value that that should be considered trusted/safe.
      * @returns {*} A value that can be used to stand in for the provided `value` in places
      * where Angular expects a $sce.trustAs() return value.
diff --git a/src/ng/templateRequest.js b/src/ng/templateRequest.js
index 94ea64e0ca14..6219308ed671 100644
--- a/src/ng/templateRequest.js
+++ b/src/ng/templateRequest.js
@@ -7,12 +7,14 @@ var $compileMinErr = minErr('$compile');
  * @name $templateRequest
  *
  * @description
- * The `$templateRequest` service downloads the provided template using `$http` and, upon success,
- * stores the contents inside of `$templateCache`. If the HTTP request fails or the response data
- * of the HTTP request is empty, a `$compile` error will be thrown (the exception can be thwarted
- * by setting the 2nd parameter of the function to true).
+ * The `$templateRequest` service runs security checks then downloads the provided template using
+ * `$http` and, upon success, stores the contents inside of `$templateCache`. If the HTTP request
+ * fails or the response data of the HTTP request is empty, a `$compile` error will be thrown (the
+ * exception can be thwarted by setting the 2nd parameter of the function to true). Note that the
+ * contents of `$templateCache` are trusted, so the call to `$sce.getTrustedUrl(tpl)` is omitted
+ * when `tpl` is of type string and `$templateCache` has the matching entry.
  *
- * @param {string} tpl The HTTP request template URL
+ * @param {string|TrustedResourceUrl} tpl The HTTP request template URL
  * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty
  *
  * @return {Promise} a promise for the HTTP response data of the given URL.
@@ -20,10 +22,19 @@ var $compileMinErr = minErr('$compile');
  * @property {number} totalPendingRequests total amount of pending template requests being downloaded.
  */
 function $TemplateRequestProvider() {
-  this.$get = ['$templateCache', '$http', '$q', function($templateCache, $http, $q) {
+  this.$get = ['$templateCache', '$http', '$q', '$sce', function($templateCache, $http, $q, $sce) {
     function handleRequestFn(tpl, ignoreRequestError) {
       handleRequestFn.totalPendingRequests++;
 
+      // We consider the template cache holds only trusted templates, so
+      // there's no need to go through whitelisting again for keys that already
+      // are included in there. This also makes Angular accept any script
+      // directive, no matter its name. However, we still need to unwrap trusted
+      // types.
+      if (!isString(tpl) || !$templateCache.get(tpl)) {
+        tpl = $sce.getTrustedResourceUrl(tpl);
+      }
+
       var transformResponse = $http.defaults && $http.defaults.transformResponse;
 
       if (isArray(transformResponse)) {
@@ -40,7 +51,7 @@ function $TemplateRequestProvider() {
       };
 
       return $http.get(tpl, httpOptions)
-        .finally(function() {
+        ['finally'](function() {
           handleRequestFn.totalPendingRequests--;
         })
         .then(function(response) {
diff --git a/src/ng/timeout.js b/src/ng/timeout.js
index 90555830c0b7..305739527c4c 100644
--- a/src/ng/timeout.js
+++ b/src/ng/timeout.js
@@ -32,6 +32,7 @@ function $TimeoutProvider() {
       * @param {number=} [delay=0] Delay in milliseconds.
       * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
       *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+      * @param {...*=} Pass additional parameters to the executed function.
       * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this
       *   promise will be resolved with is the return value of the `fn` function.
       *
@@ -43,14 +44,15 @@ function $TimeoutProvider() {
         fn = noop;
       }
 
-      var skipApply = (isDefined(invokeApply) && !invokeApply),
+      var args = sliceArgs(arguments, 3),
+          skipApply = (isDefined(invokeApply) && !invokeApply),
           deferred = (skipApply ? $$q : $q).defer(),
           promise = deferred.promise,
           timeoutId;
 
       timeoutId = $browser.defer(function() {
         try {
-          deferred.resolve(fn());
+          deferred.resolve(fn.apply(null, args));
         } catch (e) {
           deferred.reject(e);
           $exceptionHandler(e);
diff --git a/src/ng/urlUtils.js b/src/ng/urlUtils.js
index f718ada6ccaa..9f672e8d3658 100644
--- a/src/ng/urlUtils.js
+++ b/src/ng/urlUtils.js
@@ -24,20 +24,13 @@ var originUrl = urlResolve(window.location.href);
  *
  * Implementation Notes for IE
  * ---------------------------
- * IE >= 8 and <= 10 normalizes the URL when assigned to the anchor node similar to the other
+ * IE <= 10 normalizes the URL when assigned to the anchor node similar to the other
  * browsers.  However, the parsed components will not be set if the URL assigned did not specify
  * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
  * work around that by performing the parsing in a 2nd step by taking a previously normalized
  * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
  * properties such as protocol, hostname, port, etc.
  *
- * IE7 does not normalize the URL when assigned to an anchor node.  (Apparently, it does, if one
- * uses the inner HTML approach to assign the URL as part of an HTML snippet -
- * http://stackoverflow.com/a/472729)  However, setting img[src] does normalize the URL.
- * Unfortunately, setting img[src] to something like "javascript:foo" on IE throws an exception.
- * Since the primary usage for normalizing URLs is to sanitize such URLs, we can't use that
- * method and IE < 8 is unsupported.
- *
  * References:
  *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
  *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
diff --git a/src/ng/window.js b/src/ng/window.js
index 9a2637973bd8..1b0ebb0d3bbc 100644
--- a/src/ng/window.js
+++ b/src/ng/window.js
@@ -28,7 +28,7 @@
            }]);
        </script>
        <div ng-controller="ExampleController">
-         <input type="text" ng-model="greeting" />
+         <input type="text" ng-model="greeting" aria-label="greeting" />
          <button ng-click="doGreeting(greeting)">ALERT</button>
        </div>
      </file>
diff --git a/src/ngAnimate/.jshintrc b/src/ngAnimate/.jshintrc
index b738582198ed..ee79a690d2a8 100644
--- a/src/ngAnimate/.jshintrc
+++ b/src/ngAnimate/.jshintrc
@@ -1,8 +1,71 @@
 {
   "extends": "../../.jshintrc-base",
   "maxlen": false, /* ngAnimate docs contain wide tables */
+  "newcap": false,
   "browser": true,
   "globals": {
-    "angular": false
+    "angular": false,
+    "noop": false,
+
+    "forEach": false,
+    "extend": false,
+    "jqLite": false,
+    "forEach": false,
+    "isArray": false,
+    "isString": false,
+    "isObject": false,
+    "isUndefined": false,
+    "isDefined": false,
+    "isFunction": false,
+    "isElement": false,
+
+    "ELEMENT_NODE": false,
+    "COMMENT_NODE": false,
+    "NG_ANIMATE_CLASSNAME": false,
+    "NG_ANIMATE_CHILDREN_DATA": false,
+
+    "ADD_CLASS_SUFFIX": false,
+    "REMOVE_CLASS_SUFFIX": false,
+    "EVENT_CLASS_PREFIX": false,
+    "ACTIVE_CLASS_SUFFIX": false,
+
+    "TRANSITION_DURATION_PROP": false,
+    "TRANSITION_DELAY_PROP": false,
+    "TRANSITION_PROP": false,
+    "PROPERTY_KEY": false,
+    "DURATION_KEY": false,
+    "DELAY_KEY": false,
+    "TIMING_KEY": false,
+    "ANIMATION_DURATION_PROP": false,
+    "ANIMATION_DELAY_PROP": false,
+    "ANIMATION_PROP": false,
+    "ANIMATION_ITERATION_COUNT_KEY": false,
+    "SAFE_FAST_FORWARD_DURATION_VALUE": false,
+    "TRANSITIONEND_EVENT": false,
+    "ANIMATIONEND_EVENT": false,
+
+    "assertArg": false,
+    "isPromiseLike": false,
+    "mergeClasses": false,
+    "mergeAnimationOptions": false,
+    "prepareAnimationOptions": false,
+    "applyAnimationStyles": false,
+    "applyAnimationFromStyles": false,
+    "applyAnimationToStyles": false,
+    "applyAnimationClassesFactory": false,
+    "pendClasses": false,
+    "normalizeCssProp": false,
+    "packageStyles": false,
+    "removeFromArray": false,
+    "stripCommentsFromElement": false,
+    "extractElementNode": false,
+    "getDomNode": false,
+
+    "applyGeneratedPreparationClasses": false,
+    "clearGeneratedClasses": false,
+    "blockTransitions": false,
+    "blockKeyframeAnimations": false,
+    "applyInlineStyle": false,
+    "concatWithSpace": false
   }
-}
\ No newline at end of file
+}
diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js
deleted file mode 100644
index 71ed2ec4d0d5..000000000000
--- a/src/ngAnimate/animate.js
+++ /dev/null
@@ -1,2128 +0,0 @@
-'use strict';
-/* jshint maxlen: false */
-
-/**
- * @ngdoc module
- * @name ngAnimate
- * @description
- *
- * The `ngAnimate` module provides support for JavaScript, CSS3 transition and CSS3 keyframe animation hooks within existing core and custom directives.
- *
- * <div doc-module-components="ngAnimate"></div>
- *
- * # Usage
- *
- * To see animations in action, all that is required is to define the appropriate CSS classes
- * or to register a JavaScript animation via the `myModule.animation()` function. The directives that support animation automatically are:
- * `ngRepeat`, `ngInclude`, `ngIf`, `ngSwitch`, `ngShow`, `ngHide`, `ngView` and `ngClass`. Custom directives can take advantage of animation
- * by using the `$animate` service.
- *
- * Below is a more detailed breakdown of the supported animation events provided by pre-existing ng directives:
- *
- * | Directive                                                                                                | Supported Animations                                                     |
- * |----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------|
- * | {@link ng.directive:ngRepeat#animations ngRepeat}                                                        | enter, leave and move                                                    |
- * | {@link ngRoute.directive:ngView#animations ngView}                                                       | enter and leave                                                          |
- * | {@link ng.directive:ngInclude#animations ngInclude}                                                      | enter and leave                                                          |
- * | {@link ng.directive:ngSwitch#animations ngSwitch}                                                        | enter and leave                                                          |
- * | {@link ng.directive:ngIf#animations ngIf}                                                                | enter and leave                                                          |
- * | {@link ng.directive:ngClass#animations ngClass}                                                          | add and remove (the CSS class(es) present)                               |
- * | {@link ng.directive:ngShow#animations ngShow} & {@link ng.directive:ngHide#animations ngHide}            | add and remove (the ng-hide class value)                                 |
- * | {@link ng.directive:form#animation-hooks form} & {@link ng.directive:ngModel#animation-hooks ngModel}    | add and remove (dirty, pristine, valid, invalid & all other validations) |
- * | {@link module:ngMessages#animations ngMessages}                                                          | add and remove (ng-active & ng-inactive)                                 |
- * | {@link module:ngMessages#animations ngMessage}                                                           | enter and leave                                                          |
- *
- * You can find out more information about animations upon visiting each directive page.
- *
- * Below is an example of how to apply animations to a directive that supports animation hooks:
- *
- * ```html
- * <style type="text/css">
- * .slide.ng-enter, .slide.ng-leave {
- *   -webkit-transition:0.5s linear all;
- *   transition:0.5s linear all;
- * }
- *
- * .slide.ng-enter { }        /&#42; starting animations for enter &#42;/
- * .slide.ng-enter.ng-enter-active { } /&#42; terminal animations for enter &#42;/
- * .slide.ng-leave { }        /&#42; starting animations for leave &#42;/
- * .slide.ng-leave.ng-leave-active { } /&#42; terminal animations for leave &#42;/
- * </style>
- *
- * <!--
- * the animate service will automatically add .ng-enter and .ng-leave to the element
- * to trigger the CSS transition/animations
- * -->
- * <ANY class="slide" ng-include="..."></ANY>
- * ```
- *
- * Keep in mind that, by default, if an animation is running, any child elements cannot be animated
- * until the parent element's animation has completed. This blocking feature can be overridden by
- * placing the `ng-animate-children` attribute on a parent container tag.
- *
- * ```html
- * <div class="slide-animation" ng-if="on" ng-animate-children>
- *   <div class="fade-animation" ng-if="on">
- *     <div class="explode-animation" ng-if="on">
- *        ...
- *     </div>
- *   </div>
- * </div>
- * ```
- *
- * When the `on` expression value changes and an animation is triggered then each of the elements within
- * will all animate without the block being applied to child elements.
- *
- * ## Are animations run when the application starts?
- * No they are not. When an application is bootstrapped Angular will disable animations from running to avoid
- * a frenzy of animations from being triggered as soon as the browser has rendered the screen. For this to work,
- * Angular will wait for two digest cycles until enabling animations. From there on, any animation-triggering
- * layout changes in the application will trigger animations as normal.
- *
- * In addition, upon bootstrap, if the routing system or any directives or load remote data (via $http) then Angular
- * will automatically extend the wait time to enable animations once **all** of the outbound HTTP requests
- * are complete.
- *
- * ## CSS-defined Animations
- * The animate service will automatically apply two CSS classes to the animated element and these two CSS classes
- * are designed to contain the start and end CSS styling. Both CSS transitions and keyframe animations are supported
- * and can be used to play along with this naming structure.
- *
- * The following code below demonstrates how to perform animations using **CSS transitions** with Angular:
- *
- * ```html
- * <style type="text/css">
- * /&#42;
- *  The animate class is apart of the element and the ng-enter class
- *  is attached to the element once the enter animation event is triggered
- * &#42;/
- * .reveal-animation.ng-enter {
- *  -webkit-transition: 1s linear all; /&#42; Safari/Chrome &#42;/
- *  transition: 1s linear all; /&#42; All other modern browsers and IE10+ &#42;/
- *
- *  /&#42; The animation preparation code &#42;/
- *  opacity: 0;
- * }
- *
- * /&#42;
- *  Keep in mind that you want to combine both CSS
- *  classes together to avoid any CSS-specificity
- *  conflicts
- * &#42;/
- * .reveal-animation.ng-enter.ng-enter-active {
- *  /&#42; The animation code itself &#42;/
- *  opacity: 1;
- * }
- * </style>
- *
- * <div class="view-container">
- *   <div ng-view class="reveal-animation"></div>
- * </div>
- * ```
- *
- * The following code below demonstrates how to perform animations using **CSS animations** with Angular:
- *
- * ```html
- * <style type="text/css">
- * .reveal-animation.ng-enter {
- *   -webkit-animation: enter_sequence 1s linear; /&#42; Safari/Chrome &#42;/
- *   animation: enter_sequence 1s linear; /&#42; IE10+ and Future Browsers &#42;/
- * }
- * @-webkit-keyframes enter_sequence {
- *   from { opacity:0; }
- *   to { opacity:1; }
- * }
- * @keyframes enter_sequence {
- *   from { opacity:0; }
- *   to { opacity:1; }
- * }
- * </style>
- *
- * <div class="view-container">
- *   <div ng-view class="reveal-animation"></div>
- * </div>
- * ```
- *
- * Both CSS3 animations and transitions can be used together and the animate service will figure out the correct duration and delay timing.
- *
- * Upon DOM mutation, the event class is added first (something like `ng-enter`), then the browser prepares itself to add
- * the active class (in this case `ng-enter-active`) which then triggers the animation. The animation module will automatically
- * detect the CSS code to determine when the animation ends. Once the animation is over then both CSS classes will be
- * removed from the DOM. If a browser does not support CSS transitions or CSS animations then the animation will start and end
- * immediately resulting in a DOM element that is at its final state. This final state is when the DOM element
- * has no CSS transition/animation classes applied to it.
- *
- * ### Structural transition animations
- *
- * Structural transitions (such as enter, leave and move) will always apply a `0s none` transition
- * value to force the browser into rendering the styles defined in the setup (`.ng-enter`, `.ng-leave`
- * or `.ng-move`) class. This means that any active transition animations operating on the element
- * will be cut off to make way for the enter, leave or move animation.
- *
- * ### Class-based transition animations
- *
- * Class-based transitions refer to transition animations that are triggered when a CSS class is
- * added to or removed from the element (via `$animate.addClass`, `$animate.removeClass`,
- * `$animate.setClass`, or by directives such as `ngClass`, `ngModel` and `form`).
- * They are different when compared to structural animations since they **do not cancel existing
- * animations** nor do they **block successive transitions** from rendering on the same element.
- * This distinction allows for **multiple class-based transitions** to be performed on the same element.
- *
- * In addition to ngAnimate supporting the default (natural) functionality of class-based transition
- * animations, ngAnimate also decorates the element with starting and ending CSS classes to aid the
- * developer in further styling the element throughout the transition animation. Earlier versions
- * of ngAnimate may have caused natural CSS transitions to break and not render properly due to
- * $animate temporarily blocking transitions using `0s none` in order to allow the setup CSS class
- * (the `-add` or `-remove` class) to be applied without triggering an animation. However, as of
- * **version 1.3**, this workaround has been removed with ngAnimate and all non-ngAnimate CSS
- * class transitions are compatible with ngAnimate.
- *
- * There is, however, one special case when dealing with class-based transitions in ngAnimate.
- * When rendering class-based transitions that make use of the setup and active CSS classes
- * (e.g. `.fade-add` and `.fade-add-active` for when `.fade` is added) be sure to define
- * the transition value **on the active CSS class** and not the setup class.
- *
- * ```css
- * .fade-add {
- *   /&#42; remember to place a 0s transition here
- *      to ensure that the styles are applied instantly
- *      even if the element already has a transition style &#42;/
- *   transition:0s linear all;
- *
- *   /&#42; starting CSS styles &#42;/
- *   opacity:1;
- * }
- * .fade-add.fade-add-active {
- *   /&#42; this will be the length of the animation &#42;/
- *   transition:1s linear all;
- *   opacity:0;
- * }
- * ```
- *
- * The setup CSS class (in this case `.fade-add`) also has a transition style property, however, it
- * has a duration of zero. This may not be required, however, incase the browser is unable to render
- * the styling present in this CSS class instantly then it could be that the browser is attempting
- * to perform an unnecessary transition.
- *
- * This workaround, however, does not apply to  standard class-based transitions that are rendered
- * when a CSS class containing a transition is applied to an element:
- *
- * ```css
- * /&#42; this works as expected &#42;/
- * .fade {
- *   transition:1s linear all;
- *   opacity:0;
- * }
- * ```
- *
- * Please keep this in mind when coding the CSS markup that will be used within class-based transitions.
- * Also, try not to mix the two class-based animation flavors together since the CSS code may become
- * overly complex.
- *
- *
- * ### Preventing Collisions With Third Party Libraries
- *
- * Some third-party frameworks place animation duration defaults across many element or className
- * selectors in order to make their code small and reuseable. This can lead to issues with ngAnimate, which
- * is expecting actual animations on these elements and has to wait for their completion.
- *
- * You can prevent this unwanted behavior by using a prefix on all your animation classes:
- *
- * ```css
- * /&#42; prefixed with animate- &#42;/
- * .animate-fade-add.animate-fade-add-active {
- *   transition:1s linear all;
- *   opacity:0;
- * }
- * ```
- *
- * You then configure `$animate` to enforce this prefix:
- *
- * ```js
- * $animateProvider.classNameFilter(/animate-/);
- * ```
- * </div>
- *
- * ### CSS Staggering Animations
- * A Staggering animation is a collection of animations that are issued with a slight delay in between each successive operation resulting in a
- * curtain-like effect. The ngAnimate module (versions >=1.2) supports staggering animations and the stagger effect can be
- * performed by creating a **ng-EVENT-stagger** CSS class and attaching that class to the base CSS class used for
- * the animation. The style property expected within the stagger class can either be a **transition-delay** or an
- * **animation-delay** property (or both if your animation contains both transitions and keyframe animations).
- *
- * ```css
- * .my-animation.ng-enter {
- *   /&#42; standard transition code &#42;/
- *   -webkit-transition: 1s linear all;
- *   transition: 1s linear all;
- *   opacity:0;
- * }
- * .my-animation.ng-enter-stagger {
- *   /&#42; this will have a 100ms delay between each successive leave animation &#42;/
- *   -webkit-transition-delay: 0.1s;
- *   transition-delay: 0.1s;
- *
- *   /&#42; in case the stagger doesn't work then these two values
- *    must be set to 0 to avoid an accidental CSS inheritance &#42;/
- *   -webkit-transition-duration: 0s;
- *   transition-duration: 0s;
- * }
- * .my-animation.ng-enter.ng-enter-active {
- *   /&#42; standard transition styles &#42;/
- *   opacity:1;
- * }
- * ```
- *
- * Staggering animations work by default in ngRepeat (so long as the CSS class is defined). Outside of ngRepeat, to use staggering animations
- * on your own, they can be triggered by firing multiple calls to the same event on $animate. However, the restrictions surrounding this
- * are that each of the elements must have the same CSS className value as well as the same parent element. A stagger operation
- * will also be reset if more than 10ms has passed after the last animation has been fired.
- *
- * The following code will issue the **ng-leave-stagger** event on the element provided:
- *
- * ```js
- * var kids = parent.children();
- *
- * $animate.leave(kids[0]); //stagger index=0
- * $animate.leave(kids[1]); //stagger index=1
- * $animate.leave(kids[2]); //stagger index=2
- * $animate.leave(kids[3]); //stagger index=3
- * $animate.leave(kids[4]); //stagger index=4
- *
- * $timeout(function() {
- *   //stagger has reset itself
- *   $animate.leave(kids[5]); //stagger index=0
- *   $animate.leave(kids[6]); //stagger index=1
- * }, 100, false);
- * ```
- *
- * Stagger animations are currently only supported within CSS-defined animations.
- *
- * ## JavaScript-defined Animations
- * In the event that you do not want to use CSS3 transitions or CSS3 animations or if you wish to offer animations on browsers that do not
- * yet support CSS transitions/animations, then you can make use of JavaScript animations defined inside of your AngularJS module.
- *
- * ```js
- * //!annotate="YourApp" Your AngularJS Module|Replace this or ngModule with the module that you used to define your application.
- * var ngModule = angular.module('YourApp', ['ngAnimate']);
- * ngModule.animation('.my-crazy-animation', function() {
- *   return {
- *     enter: function(element, done) {
- *       //run the animation here and call done when the animation is complete
- *       return function(cancelled) {
- *         //this (optional) function will be called when the animation
- *         //completes or when the animation is cancelled (the cancelled
- *         //flag will be set to true if cancelled).
- *       };
- *     },
- *     leave: function(element, done) { },
- *     move: function(element, done) { },
- *
- *     //animation that can be triggered before the class is added
- *     beforeAddClass: function(element, className, done) { },
- *
- *     //animation that can be triggered after the class is added
- *     addClass: function(element, className, done) { },
- *
- *     //animation that can be triggered before the class is removed
- *     beforeRemoveClass: function(element, className, done) { },
- *
- *     //animation that can be triggered after the class is removed
- *     removeClass: function(element, className, done) { }
- *   };
- * });
- * ```
- *
- * JavaScript-defined animations are created with a CSS-like class selector and a collection of events which are set to run
- * a javascript callback function. When an animation is triggered, $animate will look for a matching animation which fits
- * the element's CSS class attribute value and then run the matching animation event function (if found).
- * In other words, if the CSS classes present on the animated element match any of the JavaScript animations then the callback function will
- * be executed. It should be also noted that only simple, single class selectors are allowed (compound class selectors are not supported).
- *
- * Within a JavaScript animation, an object containing various event callback animation functions is expected to be returned.
- * As explained above, these callbacks are triggered based on the animation event. Therefore if an enter animation is run,
- * and the JavaScript animation is found, then the enter callback will handle that animation (in addition to the CSS keyframe animation
- * or transition code that is defined via a stylesheet).
- *
- *
- * ### Applying Directive-specific Styles to an Animation
- * In some cases a directive or service may want to provide `$animate` with extra details that the animation will
- * include into its animation. Let's say for example we wanted to render an animation that animates an element
- * towards the mouse coordinates as to where the user clicked last. By collecting the X/Y coordinates of the click
- * (via the event parameter) we can set the `top` and `left` styles into an object and pass that into our function
- * call to `$animate.addClass`.
- *
- * ```js
- * canvas.on('click', function(e) {
- *   $animate.addClass(element, 'on', {
- *     to: {
- *       left : e.client.x + 'px',
- *       top : e.client.y + 'px'
- *     }
- *   }):
- * });
- * ```
- *
- * Now when the animation runs, and a transition or keyframe animation is picked up, then the animation itself will
- * also include and transition the styling of the `left` and `top` properties into its running animation. If we want
- * to provide some starting animation values then we can do so by placing the starting animations styles into an object
- * called `from` in the same object as the `to` animations.
- *
- * ```js
- * canvas.on('click', function(e) {
- *   $animate.addClass(element, 'on', {
- *     from: {
- *        position: 'absolute',
- *        left: '0px',
- *        top: '0px'
- *     },
- *     to: {
- *       left : e.client.x + 'px',
- *       top : e.client.y + 'px'
- *     }
- *   }):
- * });
- * ```
- *
- * Once the animation is complete or cancelled then the union of both the before and after styles are applied to the
- * element. If `ngAnimate` is not present then the styles will be applied immediately.
- *
- */
-
-angular.module('ngAnimate', ['ng'])
-
-  /**
-   * @ngdoc provider
-   * @name $animateProvider
-   * @description
-   *
-   * The `$animateProvider` allows developers to register JavaScript animation event handlers directly inside of a module.
-   * When an animation is triggered, the $animate service will query the $animate service to find any animations that match
-   * the provided name value.
-   *
-   * Requires the {@link ngAnimate `ngAnimate`} module to be installed.
-   *
-   * Please visit the {@link ngAnimate `ngAnimate`} module overview page learn more about how to use animations in your application.
-   *
-   */
-  .directive('ngAnimateChildren', function() {
-    var NG_ANIMATE_CHILDREN = '$$ngAnimateChildren';
-    return function(scope, element, attrs) {
-      var val = attrs.ngAnimateChildren;
-      if (angular.isString(val) && val.length === 0) { //empty attribute
-        element.data(NG_ANIMATE_CHILDREN, true);
-      } else {
-        scope.$watch(val, function(value) {
-          element.data(NG_ANIMATE_CHILDREN, !!value);
-        });
-      }
-    };
-  })
-
-  //this private service is only used within CSS-enabled animations
-  //IE8 + IE9 do not support rAF natively, but that is fine since they
-  //also don't support transitions and keyframes which means that the code
-  //below will never be used by the two browsers.
-  .factory('$$animateReflow', ['$$rAF', '$document', function($$rAF, $document) {
-    var bod = $document[0].body;
-    return function(fn) {
-      //the returned function acts as the cancellation function
-      return $$rAF(function() {
-        //the line below will force the browser to perform a repaint
-        //so that all the animated elements within the animation frame
-        //will be properly updated and drawn on screen. This is
-        //required to perform multi-class CSS based animations with
-        //Firefox. DO NOT REMOVE THIS LINE.
-        var a = bod.offsetWidth + 1;
-        fn();
-      });
-    };
-  }])
-
-  .config(['$provide', '$animateProvider', function($provide, $animateProvider) {
-    var noop = angular.noop;
-    var forEach = angular.forEach;
-    var selectors = $animateProvider.$$selectors;
-    var isArray = angular.isArray;
-    var isString = angular.isString;
-    var isObject = angular.isObject;
-
-    var ELEMENT_NODE = 1;
-    var NG_ANIMATE_STATE = '$$ngAnimateState';
-    var NG_ANIMATE_CHILDREN = '$$ngAnimateChildren';
-    var NG_ANIMATE_CLASS_NAME = 'ng-animate';
-    var rootAnimateState = {running: true};
-
-    function extractElementNode(element) {
-      for (var i = 0; i < element.length; i++) {
-        var elm = element[i];
-        if (elm.nodeType == ELEMENT_NODE) {
-          return elm;
-        }
-      }
-    }
-
-    function prepareElement(element) {
-      return element && angular.element(element);
-    }
-
-    function stripCommentsFromElement(element) {
-      return angular.element(extractElementNode(element));
-    }
-
-    function isMatchingElement(elm1, elm2) {
-      return extractElementNode(elm1) == extractElementNode(elm2);
-    }
-    var $$jqLite;
-    $provide.decorator('$animate',
-        ['$delegate', '$$q', '$injector', '$sniffer', '$rootElement', '$$asyncCallback', '$rootScope', '$document', '$templateRequest', '$$jqLite',
- function($delegate,   $$q,   $injector,   $sniffer,   $rootElement,   $$asyncCallback,   $rootScope,   $document,   $templateRequest,   $$$jqLite) {
-
-      $$jqLite = $$$jqLite;
-      $rootElement.data(NG_ANIMATE_STATE, rootAnimateState);
-
-      // Wait until all directive and route-related templates are downloaded and
-      // compiled. The $templateRequest.totalPendingRequests variable keeps track of
-      // all of the remote templates being currently downloaded. If there are no
-      // templates currently downloading then the watcher will still fire anyway.
-      var deregisterWatch = $rootScope.$watch(
-        function() { return $templateRequest.totalPendingRequests; },
-        function(val, oldVal) {
-          if (val !== 0) return;
-          deregisterWatch();
-
-          // Now that all templates have been downloaded, $animate will wait until
-          // the post digest queue is empty before enabling animations. By having two
-          // calls to $postDigest calls we can ensure that the flag is enabled at the
-          // very end of the post digest queue. Since all of the animations in $animate
-          // use $postDigest, it's important that the code below executes at the end.
-          // This basically means that the page is fully downloaded and compiled before
-          // any animations are triggered.
-          $rootScope.$$postDigest(function() {
-            $rootScope.$$postDigest(function() {
-              rootAnimateState.running = false;
-            });
-          });
-        }
-      );
-
-      var globalAnimationCounter = 0;
-      var classNameFilter = $animateProvider.classNameFilter();
-      var isAnimatableClassName = !classNameFilter
-              ? function() { return true; }
-              : function(className) {
-                return classNameFilter.test(className);
-              };
-
-      function classBasedAnimationsBlocked(element, setter) {
-        var data = element.data(NG_ANIMATE_STATE) || {};
-        if (setter) {
-          data.running = true;
-          data.structural = true;
-          element.data(NG_ANIMATE_STATE, data);
-        }
-        return data.disabled || (data.running && data.structural);
-      }
-
-      function runAnimationPostDigest(fn) {
-        var cancelFn, defer = $$q.defer();
-        defer.promise.$$cancelFn = function() {
-          cancelFn && cancelFn();
-        };
-        $rootScope.$$postDigest(function() {
-          cancelFn = fn(function() {
-            defer.resolve();
-          });
-        });
-        return defer.promise;
-      }
-
-      function parseAnimateOptions(options) {
-        // some plugin code may still be passing in the callback
-        // function as the last param for the $animate methods so
-        // it's best to only allow string or array values for now
-        if (isObject(options)) {
-          if (options.tempClasses && isString(options.tempClasses)) {
-            options.tempClasses = options.tempClasses.split(/\s+/);
-          }
-          return options;
-        }
-      }
-
-      function resolveElementClasses(element, cache, runningAnimations) {
-        runningAnimations = runningAnimations || {};
-
-        var lookup = {};
-        forEach(runningAnimations, function(data, selector) {
-          forEach(selector.split(' '), function(s) {
-            lookup[s]=data;
-          });
-        });
-
-        var hasClasses = Object.create(null);
-        forEach((element.attr('class') || '').split(/\s+/), function(className) {
-          hasClasses[className] = true;
-        });
-
-        var toAdd = [], toRemove = [];
-        forEach((cache && cache.classes) || [], function(status, className) {
-          var hasClass = hasClasses[className];
-          var matchingAnimation = lookup[className] || {};
-
-          // When addClass and removeClass is called then $animate will check to
-          // see if addClass and removeClass cancel each other out. When there are
-          // more calls to removeClass than addClass then the count falls below 0
-          // and then the removeClass animation will be allowed. Otherwise if the
-          // count is above 0 then that means an addClass animation will commence.
-          // Once an animation is allowed then the code will also check to see if
-          // there exists any on-going animation that is already adding or remvoing
-          // the matching CSS class.
-          if (status === false) {
-            //does it have the class or will it have the class
-            if (hasClass || matchingAnimation.event == 'addClass') {
-              toRemove.push(className);
-            }
-          } else if (status === true) {
-            //is the class missing or will it be removed?
-            if (!hasClass || matchingAnimation.event == 'removeClass') {
-              toAdd.push(className);
-            }
-          }
-        });
-
-        return (toAdd.length + toRemove.length) > 0 && [toAdd.join(' '), toRemove.join(' ')];
-      }
-
-      function lookup(name) {
-        if (name) {
-          var matches = [],
-              flagMap = {},
-              classes = name.substr(1).split('.');
-
-          //the empty string value is the default animation
-          //operation which performs CSS transition and keyframe
-          //animations sniffing. This is always included for each
-          //element animation procedure if the browser supports
-          //transitions and/or keyframe animations. The default
-          //animation is added to the top of the list to prevent
-          //any previous animations from affecting the element styling
-          //prior to the element being animated.
-          if ($sniffer.transitions || $sniffer.animations) {
-            matches.push($injector.get(selectors['']));
-          }
-
-          for (var i=0; i < classes.length; i++) {
-            var klass = classes[i],
-                selectorFactoryName = selectors[klass];
-            if (selectorFactoryName && !flagMap[klass]) {
-              matches.push($injector.get(selectorFactoryName));
-              flagMap[klass] = true;
-            }
-          }
-          return matches;
-        }
-      }
-
-      function animationRunner(element, animationEvent, className, options) {
-        //transcluded directives may sometimes fire an animation using only comment nodes
-        //best to catch this early on to prevent any animation operations from occurring
-        var node = element[0];
-        if (!node) {
-          return;
-        }
-
-        if (options) {
-          options.to = options.to || {};
-          options.from = options.from || {};
-        }
-
-        var classNameAdd;
-        var classNameRemove;
-        if (isArray(className)) {
-          classNameAdd = className[0];
-          classNameRemove = className[1];
-          if (!classNameAdd) {
-            className = classNameRemove;
-            animationEvent = 'removeClass';
-          } else if (!classNameRemove) {
-            className = classNameAdd;
-            animationEvent = 'addClass';
-          } else {
-            className = classNameAdd + ' ' + classNameRemove;
-          }
-        }
-
-        var isSetClassOperation = animationEvent == 'setClass';
-        var isClassBased = isSetClassOperation
-                           || animationEvent == 'addClass'
-                           || animationEvent == 'removeClass'
-                           || animationEvent == 'animate';
-
-        var currentClassName = element.attr('class');
-        var classes = currentClassName + ' ' + className;
-        if (!isAnimatableClassName(classes)) {
-          return;
-        }
-
-        var beforeComplete = noop,
-            beforeCancel = [],
-            before = [],
-            afterComplete = noop,
-            afterCancel = [],
-            after = [];
-
-        var animationLookup = (' ' + classes).replace(/\s+/g,'.');
-        forEach(lookup(animationLookup), function(animationFactory) {
-          var created = registerAnimation(animationFactory, animationEvent);
-          if (!created && isSetClassOperation) {
-            registerAnimation(animationFactory, 'addClass');
-            registerAnimation(animationFactory, 'removeClass');
-          }
-        });
-
-        function registerAnimation(animationFactory, event) {
-          var afterFn = animationFactory[event];
-          var beforeFn = animationFactory['before' + event.charAt(0).toUpperCase() + event.substr(1)];
-          if (afterFn || beforeFn) {
-            if (event == 'leave') {
-              beforeFn = afterFn;
-              //when set as null then animation knows to skip this phase
-              afterFn = null;
-            }
-            after.push({
-              event: event, fn: afterFn
-            });
-            before.push({
-              event: event, fn: beforeFn
-            });
-            return true;
-          }
-        }
-
-        function run(fns, cancellations, allCompleteFn) {
-          var animations = [];
-          forEach(fns, function(animation) {
-            animation.fn && animations.push(animation);
-          });
-
-          var count = 0;
-          function afterAnimationComplete(index) {
-            if (cancellations) {
-              (cancellations[index] || noop)();
-              if (++count < animations.length) return;
-              cancellations = null;
-            }
-            allCompleteFn();
-          }
-
-          //The code below adds directly to the array in order to work with
-          //both sync and async animations. Sync animations are when the done()
-          //operation is called right away. DO NOT REFACTOR!
-          forEach(animations, function(animation, index) {
-            var progress = function() {
-              afterAnimationComplete(index);
-            };
-            switch (animation.event) {
-              case 'setClass':
-                cancellations.push(animation.fn(element, classNameAdd, classNameRemove, progress, options));
-                break;
-              case 'animate':
-                cancellations.push(animation.fn(element, className, options.from, options.to, progress));
-                break;
-              case 'addClass':
-                cancellations.push(animation.fn(element, classNameAdd || className,     progress, options));
-                break;
-              case 'removeClass':
-                cancellations.push(animation.fn(element, classNameRemove || className,  progress, options));
-                break;
-              default:
-                cancellations.push(animation.fn(element, progress, options));
-                break;
-            }
-          });
-
-          if (cancellations && cancellations.length === 0) {
-            allCompleteFn();
-          }
-        }
-
-        return {
-          node: node,
-          event: animationEvent,
-          className: className,
-          isClassBased: isClassBased,
-          isSetClassOperation: isSetClassOperation,
-          applyStyles: function() {
-            if (options) {
-              element.css(angular.extend(options.from || {}, options.to || {}));
-            }
-          },
-          before: function(allCompleteFn) {
-            beforeComplete = allCompleteFn;
-            run(before, beforeCancel, function() {
-              beforeComplete = noop;
-              allCompleteFn();
-            });
-          },
-          after: function(allCompleteFn) {
-            afterComplete = allCompleteFn;
-            run(after, afterCancel, function() {
-              afterComplete = noop;
-              allCompleteFn();
-            });
-          },
-          cancel: function() {
-            if (beforeCancel) {
-              forEach(beforeCancel, function(cancelFn) {
-                (cancelFn || noop)(true);
-              });
-              beforeComplete(true);
-            }
-            if (afterCancel) {
-              forEach(afterCancel, function(cancelFn) {
-                (cancelFn || noop)(true);
-              });
-              afterComplete(true);
-            }
-          }
-        };
-      }
-
-      /**
-       * @ngdoc service
-       * @name $animate
-       * @kind object
-       *
-       * @description
-       * The `$animate` service provides animation detection support while performing DOM operations (enter, leave and move) as well as during addClass and removeClass operations.
-       * When any of these operations are run, the $animate service
-       * will examine any JavaScript-defined animations (which are defined by using the $animateProvider provider object)
-       * as well as any CSS-defined animations against the CSS classes present on the element once the DOM operation is run.
-       *
-       * The `$animate` service is used behind the scenes with pre-existing directives and animation with these directives
-       * will work out of the box without any extra configuration.
-       *
-       * Requires the {@link ngAnimate `ngAnimate`} module to be installed.
-       *
-       * Please visit the {@link ngAnimate `ngAnimate`} module overview page learn more about how to use animations in your application.
-       * ## Callback Promises
-       * With AngularJS 1.3, each of the animation methods, on the `$animate` service, return a promise when called. The
-       * promise itself is then resolved once the animation has completed itself, has been cancelled or has been
-       * skipped due to animations being disabled. (Note that even if the animation is cancelled it will still
-       * call the resolve function of the animation.)
-       *
-       * ```js
-       * $animate.enter(element, container).then(function() {
-       *   //...this is called once the animation is complete...
-       * });
-       * ```
-       *
-       * Also note that, due to the nature of the callback promise, if any Angular-specific code (like changing the scope,
-       * location of the page, etc...) is executed within the callback promise then be sure to wrap the code using
-       * `$scope.$apply(...)`;
-       *
-       * ```js
-       * $animate.leave(element).then(function() {
-       *   $scope.$apply(function() {
-       *     $location.path('/new-page');
-       *   });
-       * });
-       * ```
-       *
-       * An animation can also be cancelled by calling the `$animate.cancel(promise)` method with the provided
-       * promise that was returned when the animation was started.
-       *
-       * ```js
-       * var promise = $animate.addClass(element, 'super-long-animation');
-       * promise.then(function() {
-       *   //this will still be called even if cancelled
-       * });
-       *
-       * element.on('click', function() {
-       *   //tooo lazy to wait for the animation to end
-       *   $animate.cancel(promise);
-       * });
-       * ```
-       *
-       * (Keep in mind that the promise cancellation is unique to `$animate` since promises in
-       * general cannot be cancelled.)
-       *
-       */
-      return {
-        /**
-         * @ngdoc method
-         * @name $animate#animate
-         * @kind function
-         *
-         * @description
-         * Performs an inline animation on the element which applies the provided `to` and `from` CSS styles to the element.
-         * If any detected CSS transition, keyframe or JavaScript matches the provided `className` value then the animation
-         * will take on the provided styles. For example, if a transition animation is set for the given className then the
-         * provided `from` and `to` styles will be applied alongside the given transition. If a JavaScript animation is
-         * detected then the provided styles will be given in as function paramters.
-         *
-         * ```js
-         * ngModule.animation('.my-inline-animation', function() {
-         *   return {
-         *     animate : function(element, className, from, to, done) {
-         *       //styles
-         *     }
-         *   }
-         * });
-         * ```
-         *
-         * Below is a breakdown of each step that occurs during the `animate` animation:
-         *
-         * | Animation Step                                                                                                        | What the element class attribute looks like                  |
-         * |-----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------|
-         * | 1. `$animate.animate(...)` is called                                                                                  | `class="my-animation"`                                       |
-         * | 2. `$animate` waits for the next digest to start the animation                                                        | `class="my-animation ng-animate"`                            |
-         * | 3. `$animate` runs the JavaScript-defined animations detected on the element                                          | `class="my-animation ng-animate"`                            |
-         * | 4. the `className` class value is added to the element                                                                | `class="my-animation ng-animate className"`                  |
-         * | 5. `$animate` scans the element styles to get the CSS transition/animation duration and delay                         | `class="my-animation ng-animate className"`                  |
-         * | 6. `$animate` blocks all CSS transitions on the element to ensure the `.className` class styling is applied right away| `class="my-animation ng-animate className"`                  |
-         * | 7. `$animate` applies the provided collection of `from` CSS styles to the element                                     | `class="my-animation ng-animate className"`                  |
-         * | 8. `$animate` waits for a single animation frame (this performs a reflow)                                             | `class="my-animation ng-animate className"`                  |
-         * | 9. `$animate` removes the CSS transition block placed on the element                                                  | `class="my-animation ng-animate className"`                  |
-         * | 10. the `className-active` class is added (this triggers the CSS transition/animation)                                | `class="my-animation ng-animate className className-active"` |
-         * | 11. `$animate` applies the collection of `to` CSS styles to the element which are then handled by the transition      | `class="my-animation ng-animate className className-active"` |
-         * | 12. `$animate` waits for the animation to complete (via events and timeout)                                           | `class="my-animation ng-animate className className-active"` |
-         * | 13. The animation ends and all generated CSS classes are removed from the element                                     | `class="my-animation"`                                       |
-         * | 14. The returned promise is resolved.                                                                                 | `class="my-animation"`                                       |
-         *
-         * @param {DOMElement} element the element that will be the focus of the enter animation
-         * @param {object} from a collection of CSS styles that will be applied to the element at the start of the animation
-         * @param {object} to a collection of CSS styles that the element will animate towards
-         * @param {string=} className an optional CSS class that will be added to the element for the duration of the animation (the default class is `ng-inline-animate`)
-         * @param {object=} options an optional collection of options that will be picked up by the CSS transition/animation
-         * @return {Promise} the animation callback promise
-        */
-        animate: function(element, from, to, className, options) {
-          className = className || 'ng-inline-animate';
-          options = parseAnimateOptions(options) || {};
-          options.from = to ? from : null;
-          options.to   = to ? to : from;
-
-          return runAnimationPostDigest(function(done) {
-            return performAnimation('animate', className, stripCommentsFromElement(element), null, null, noop, options, done);
-          });
-        },
-
-        /**
-         * @ngdoc method
-         * @name $animate#enter
-         * @kind function
-         *
-         * @description
-         * Appends the element to the parentElement element that resides in the document and then runs the enter animation. Once
-         * the animation is started, the following CSS classes will be present on the element for the duration of the animation:
-         *
-         * Below is a breakdown of each step that occurs during enter animation:
-         *
-         * | Animation Step                                                                                                        | What the element class attribute looks like                |
-         * |-----------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------|
-         * | 1. `$animate.enter(...)` is called                                                                                    | `class="my-animation"`                                     |
-         * | 2. element is inserted into the `parentElement` element or beside the `afterElement` element                          | `class="my-animation"`                                     |
-         * | 3. `$animate` waits for the next digest to start the animation                                                        | `class="my-animation ng-animate"`                          |
-         * | 4. `$animate` runs the JavaScript-defined animations detected on the element                                          | `class="my-animation ng-animate"`                          |
-         * | 5. the `.ng-enter` class is added to the element                                                                      | `class="my-animation ng-animate ng-enter"`                 |
-         * | 6. `$animate` scans the element styles to get the CSS transition/animation duration and delay                         | `class="my-animation ng-animate ng-enter"`                 |
-         * | 7. `$animate` blocks all CSS transitions on the element to ensure the `.ng-enter` class styling is applied right away | `class="my-animation ng-animate ng-enter"`                 |
-         * | 8. `$animate` waits for a single animation frame (this performs a reflow)                                             | `class="my-animation ng-animate ng-enter"`                 |
-         * | 9. `$animate` removes the CSS transition block placed on the element                                                  | `class="my-animation ng-animate ng-enter"`                 |
-         * | 10. the `.ng-enter-active` class is added (this triggers the CSS transition/animation)                                | `class="my-animation ng-animate ng-enter ng-enter-active"` |
-         * | 11. `$animate` waits for the animation to complete (via events and timeout)                                           | `class="my-animation ng-animate ng-enter ng-enter-active"` |
-         * | 12. The animation ends and all generated CSS classes are removed from the element                                     | `class="my-animation"`                                     |
-         * | 13. The returned promise is resolved.                                                                                 | `class="my-animation"`                                     |
-         *
-         * @param {DOMElement} element the element that will be the focus of the enter animation
-         * @param {DOMElement} parentElement the parent element of the element that will be the focus of the enter animation
-         * @param {DOMElement} afterElement the sibling element (which is the previous element) of the element that will be the focus of the enter animation
-         * @param {object=} options an optional collection of options that will be picked up by the CSS transition/animation
-         * @return {Promise} the animation callback promise
-        */
-        enter: function(element, parentElement, afterElement, options) {
-          options = parseAnimateOptions(options);
-          element = angular.element(element);
-          parentElement = prepareElement(parentElement);
-          afterElement = prepareElement(afterElement);
-
-          classBasedAnimationsBlocked(element, true);
-          $delegate.enter(element, parentElement, afterElement);
-          return runAnimationPostDigest(function(done) {
-            return performAnimation('enter', 'ng-enter', stripCommentsFromElement(element), parentElement, afterElement, noop, options, done);
-          });
-        },
-
-        /**
-         * @ngdoc method
-         * @name $animate#leave
-         * @kind function
-         *
-         * @description
-         * Runs the leave animation operation and, upon completion, removes the element from the DOM. Once
-         * the animation is started, the following CSS classes will be added for the duration of the animation:
-         *
-         * Below is a breakdown of each step that occurs during leave animation:
-         *
-         * | Animation Step                                                                                                        | What the element class attribute looks like                |
-         * |-----------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------|
-         * | 1. `$animate.leave(...)` is called                                                                                    | `class="my-animation"`                                     |
-         * | 2. `$animate` runs the JavaScript-defined animations detected on the element                                          | `class="my-animation ng-animate"`                          |
-         * | 3. `$animate` waits for the next digest to start the animation                                                        | `class="my-animation ng-animate"`                          |
-         * | 4. the `.ng-leave` class is added to the element                                                                      | `class="my-animation ng-animate ng-leave"`                 |
-         * | 5. `$animate` scans the element styles to get the CSS transition/animation duration and delay                         | `class="my-animation ng-animate ng-leave"`                 |
-         * | 6. `$animate` blocks all CSS transitions on the element to ensure the `.ng-leave` class styling is applied right away | `class="my-animation ng-animate ng-leave"`                 |
-         * | 7. `$animate` waits for a single animation frame (this performs a reflow)                                             | `class="my-animation ng-animate ng-leave"`                 |
-         * | 8. `$animate` removes the CSS transition block placed on the element                                                  | `class="my-animation ng-animate ng-leave"`                 |
-         * | 9. the `.ng-leave-active` class is added (this triggers the CSS transition/animation)                                 | `class="my-animation ng-animate ng-leave ng-leave-active"` |
-         * | 10. `$animate` waits for the animation to complete (via events and timeout)                                           | `class="my-animation ng-animate ng-leave ng-leave-active"` |
-         * | 11. The animation ends and all generated CSS classes are removed from the element                                     | `class="my-animation"`                                     |
-         * | 12. The element is removed from the DOM                                                                               | ...                                                        |
-         * | 13. The returned promise is resolved.                                                                                 | ...                                                        |
-         *
-         * @param {DOMElement} element the element that will be the focus of the leave animation
-         * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation
-         * @return {Promise} the animation callback promise
-        */
-        leave: function(element, options) {
-          options = parseAnimateOptions(options);
-          element = angular.element(element);
-
-          cancelChildAnimations(element);
-          classBasedAnimationsBlocked(element, true);
-          return runAnimationPostDigest(function(done) {
-            return performAnimation('leave', 'ng-leave', stripCommentsFromElement(element), null, null, function() {
-              $delegate.leave(element);
-            }, options, done);
-          });
-        },
-
-        /**
-         * @ngdoc method
-         * @name $animate#move
-         * @kind function
-         *
-         * @description
-         * Fires the move DOM operation. Just before the animation starts, the animate service will either append it into the parentElement container or
-         * add the element directly after the afterElement element if present. Then the move animation will be run. Once
-         * the animation is started, the following CSS classes will be added for the duration of the animation:
-         *
-         * Below is a breakdown of each step that occurs during move animation:
-         *
-         * | Animation Step                                                                                                       | What the element class attribute looks like              |
-         * |----------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------|
-         * | 1. `$animate.move(...)` is called                                                                                    | `class="my-animation"`                                   |
-         * | 2. element is moved into the parentElement element or beside the afterElement element                                | `class="my-animation"`                                   |
-         * | 3. `$animate` waits for the next digest to start the animation                                                       | `class="my-animation ng-animate"`                        |
-         * | 4. `$animate` runs the JavaScript-defined animations detected on the element                                         | `class="my-animation ng-animate"`                        |
-         * | 5. the `.ng-move` class is added to the element                                                                      | `class="my-animation ng-animate ng-move"`                |
-         * | 6. `$animate` scans the element styles to get the CSS transition/animation duration and delay                        | `class="my-animation ng-animate ng-move"`                |
-         * | 7. `$animate` blocks all CSS transitions on the element to ensure the `.ng-move` class styling is applied right away | `class="my-animation ng-animate ng-move"`                |
-         * | 8. `$animate` waits for a single animation frame (this performs a reflow)                                            | `class="my-animation ng-animate ng-move"`                |
-         * | 9. `$animate` removes the CSS transition block placed on the element                                                 | `class="my-animation ng-animate ng-move"`                |
-         * | 10. the `.ng-move-active` class is added (this triggers the CSS transition/animation)                                | `class="my-animation ng-animate ng-move ng-move-active"` |
-         * | 11. `$animate` waits for the animation to complete (via events and timeout)                                          | `class="my-animation ng-animate ng-move ng-move-active"` |
-         * | 12. The animation ends and all generated CSS classes are removed from the element                                    | `class="my-animation"`                                   |
-         * | 13. The returned promise is resolved.                                                                                | `class="my-animation"`                                   |
-         *
-         * @param {DOMElement} element the element that will be the focus of the move animation
-         * @param {DOMElement} parentElement the parentElement element of the element that will be the focus of the move animation
-         * @param {DOMElement} afterElement the sibling element (which is the previous element) of the element that will be the focus of the move animation
-         * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation
-         * @return {Promise} the animation callback promise
-        */
-        move: function(element, parentElement, afterElement, options) {
-          options = parseAnimateOptions(options);
-          element = angular.element(element);
-          parentElement = prepareElement(parentElement);
-          afterElement = prepareElement(afterElement);
-
-          cancelChildAnimations(element);
-          classBasedAnimationsBlocked(element, true);
-          $delegate.move(element, parentElement, afterElement);
-          return runAnimationPostDigest(function(done) {
-            return performAnimation('move', 'ng-move', stripCommentsFromElement(element), parentElement, afterElement, noop, options, done);
-          });
-        },
-
-        /**
-         * @ngdoc method
-         * @name $animate#addClass
-         *
-         * @description
-         * Triggers a custom animation event based off the className variable and then attaches the className value to the element as a CSS class.
-         * Unlike the other animation methods, the animate service will suffix the className value with {@type -add} in order to provide
-         * the animate service the setup and active CSS classes in order to trigger the animation (this will be skipped if no CSS transitions
-         * or keyframes are defined on the -add-active or base CSS class).
-         *
-         * Below is a breakdown of each step that occurs during addClass animation:
-         *
-         * | Animation Step                                                                                         | What the element class attribute looks like                        |
-         * |--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------|
-         * | 1. `$animate.addClass(element, 'super')` is called                                                     | `class="my-animation"`                                             |
-         * | 2. `$animate` runs the JavaScript-defined animations detected on the element                           | `class="my-animation ng-animate"`                                  |
-         * | 3. the `.super-add` class is added to the element                                                      | `class="my-animation ng-animate super-add"`                        |
-         * | 4. `$animate` waits for a single animation frame (this performs a reflow)                              | `class="my-animation ng-animate super-add"`                        |
-         * | 5. the `.super` and `.super-add-active` classes are added (this triggers the CSS transition/animation) | `class="my-animation ng-animate super super-add super-add-active"` |
-         * | 6. `$animate` scans the element styles to get the CSS transition/animation duration and delay          | `class="my-animation ng-animate super super-add super-add-active"` |
-         * | 7. `$animate` waits for the animation to complete (via events and timeout)                             | `class="my-animation ng-animate super super-add super-add-active"` |
-         * | 8. The animation ends and all generated CSS classes are removed from the element                       | `class="my-animation super"`                                       |
-         * | 9. The super class is kept on the element                                                              | `class="my-animation super"`                                       |
-         * | 10. The returned promise is resolved.                                                                  | `class="my-animation super"`                                       |
-         *
-         * @param {DOMElement} element the element that will be animated
-         * @param {string} className the CSS class that will be added to the element and then animated
-         * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation
-         * @return {Promise} the animation callback promise
-        */
-        addClass: function(element, className, options) {
-          return this.setClass(element, className, [], options);
-        },
-
-        /**
-         * @ngdoc method
-         * @name $animate#removeClass
-         *
-         * @description
-         * Triggers a custom animation event based off the className variable and then removes the CSS class provided by the className value
-         * from the element. Unlike the other animation methods, the animate service will suffix the className value with {@type -remove} in
-         * order to provide the animate service the setup and active CSS classes in order to trigger the animation (this will be skipped if
-         * no CSS transitions or keyframes are defined on the -remove or base CSS classes).
-         *
-         * Below is a breakdown of each step that occurs during removeClass animation:
-         *
-         * | Animation Step                                                                                                       | What the element class attribute looks like                        |
-         * |----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------|
-         * | 1. `$animate.removeClass(element, 'super')` is called                                                                | `class="my-animation super"`                                       |
-         * | 2. `$animate` runs the JavaScript-defined animations detected on the element                                         | `class="my-animation super ng-animate"`                            |
-         * | 3. the `.super-remove` class is added to the element                                                                 | `class="my-animation super ng-animate super-remove"`               |
-         * | 4. `$animate` waits for a single animation frame (this performs a reflow)                                            | `class="my-animation super ng-animate super-remove"`               |
-         * | 5. the `.super-remove-active` classes are added and `.super` is removed (this triggers the CSS transition/animation) | `class="my-animation ng-animate super-remove super-remove-active"` |
-         * | 6. `$animate` scans the element styles to get the CSS transition/animation duration and delay                        | `class="my-animation ng-animate super-remove super-remove-active"` |
-         * | 7. `$animate` waits for the animation to complete (via events and timeout)                                           | `class="my-animation ng-animate super-remove super-remove-active"` |
-         * | 8. The animation ends and all generated CSS classes are removed from the element                                     | `class="my-animation"`                                             |
-         * | 9. The returned promise is resolved.                                                                                 | `class="my-animation"`                                             |
-         *
-         *
-         * @param {DOMElement} element the element that will be animated
-         * @param {string} className the CSS class that will be animated and then removed from the element
-         * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation
-         * @return {Promise} the animation callback promise
-        */
-        removeClass: function(element, className, options) {
-          return this.setClass(element, [], className, options);
-        },
-
-        /**
-         *
-         * @ngdoc method
-         * @name $animate#setClass
-         *
-         * @description Adds and/or removes the given CSS classes to and from the element.
-         * Once complete, the `done()` callback will be fired (if provided).
-         *
-         * | Animation Step                                                                                                                               | What the element class attribute looks like                                            |
-         * |----------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------|
-         * | 1. `$animate.setClass(element, 'on', 'off')` is called                                                                                       | `class="my-animation off"`                                                             |
-         * | 2. `$animate` runs the JavaScript-defined animations detected on the element                                                                 | `class="my-animation ng-animate off"`                                                  |
-         * | 3. the `.on-add` and `.off-remove` classes are added to the element                                                                          | `class="my-animation ng-animate on-add off-remove off"`                                |
-         * | 4. `$animate` waits for a single animation frame (this performs a reflow)                                                                    | `class="my-animation ng-animate on-add off-remove off"`                                |
-         * | 5. the `.on`, `.on-add-active` and `.off-remove-active` classes are added and `.off` is removed (this triggers the CSS transition/animation) | `class="my-animation ng-animate on on-add on-add-active off-remove off-remove-active"` |
-         * | 6. `$animate` scans the element styles to get the CSS transition/animation duration and delay                                                | `class="my-animation ng-animate on on-add on-add-active off-remove off-remove-active"` |
-         * | 7. `$animate` waits for the animation to complete (via events and timeout)                                                                   | `class="my-animation ng-animate on on-add on-add-active off-remove off-remove-active"` |
-         * | 8. The animation ends and all generated CSS classes are removed from the element                                                             | `class="my-animation on"`                                                              |
-         * | 9. The returned promise is resolved.                                                                                                         | `class="my-animation on"`                                                              |
-         *
-         * @param {DOMElement} element the element which will have its CSS classes changed
-         *   removed from it
-         * @param {string} add the CSS classes which will be added to the element
-         * @param {string} remove the CSS class which will be removed from the element
-         *   CSS classes have been set on the element
-         * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation
-         * @return {Promise} the animation callback promise
-         */
-        setClass: function(element, add, remove, options) {
-          options = parseAnimateOptions(options);
-
-          var STORAGE_KEY = '$$animateClasses';
-          element = angular.element(element);
-          element = stripCommentsFromElement(element);
-
-          if (classBasedAnimationsBlocked(element)) {
-            return $delegate.$$setClassImmediately(element, add, remove, options);
-          }
-
-          // we're using a combined array for both the add and remove
-          // operations since the ORDER OF addClass and removeClass matters
-          var classes, cache = element.data(STORAGE_KEY);
-          var hasCache = !!cache;
-          if (!cache) {
-            cache = {};
-            cache.classes = {};
-          }
-          classes = cache.classes;
-
-          add = isArray(add) ? add : add.split(' ');
-          forEach(add, function(c) {
-            if (c && c.length) {
-              classes[c] = true;
-            }
-          });
-
-          remove = isArray(remove) ? remove : remove.split(' ');
-          forEach(remove, function(c) {
-            if (c && c.length) {
-              classes[c] = false;
-            }
-          });
-
-          if (hasCache) {
-            if (options && cache.options) {
-              cache.options = angular.extend(cache.options || {}, options);
-            }
-
-            //the digest cycle will combine all the animations into one function
-            return cache.promise;
-          } else {
-            element.data(STORAGE_KEY, cache = {
-              classes: classes,
-              options: options
-            });
-          }
-
-          return cache.promise = runAnimationPostDigest(function(done) {
-            var parentElement = element.parent();
-            var elementNode = extractElementNode(element);
-            var parentNode = elementNode.parentNode;
-            // TODO(matsko): move this code into the animationsDisabled() function once #8092 is fixed
-            if (!parentNode || parentNode['$$NG_REMOVED'] || elementNode['$$NG_REMOVED']) {
-              done();
-              return;
-            }
-
-            var cache = element.data(STORAGE_KEY);
-            element.removeData(STORAGE_KEY);
-
-            var state = element.data(NG_ANIMATE_STATE) || {};
-            var classes = resolveElementClasses(element, cache, state.active);
-            return !classes
-              ? done()
-              : performAnimation('setClass', classes, element, parentElement, null, function() {
-                  if (classes[0]) $delegate.$$addClassImmediately(element, classes[0]);
-                  if (classes[1]) $delegate.$$removeClassImmediately(element, classes[1]);
-                }, cache.options, done);
-          });
-        },
-
-        /**
-         * @ngdoc method
-         * @name $animate#cancel
-         * @kind function
-         *
-         * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
-         *
-         * @description
-         * Cancels the provided animation.
-        */
-        cancel: function(promise) {
-          promise.$$cancelFn();
-        },
-
-        /**
-         * @ngdoc method
-         * @name $animate#enabled
-         * @kind function
-         *
-         * @param {boolean=} value If provided then set the animation on or off.
-         * @param {DOMElement=} element If provided then the element will be used to represent the enable/disable operation
-         * @return {boolean} Current animation state.
-         *
-         * @description
-         * Globally enables/disables animations.
-         *
-        */
-        enabled: function(value, element) {
-          switch (arguments.length) {
-            case 2:
-              if (value) {
-                cleanup(element);
-              } else {
-                var data = element.data(NG_ANIMATE_STATE) || {};
-                data.disabled = true;
-                element.data(NG_ANIMATE_STATE, data);
-              }
-            break;
-
-            case 1:
-              rootAnimateState.disabled = !value;
-            break;
-
-            default:
-              value = !rootAnimateState.disabled;
-            break;
-          }
-          return !!value;
-         }
-      };
-
-      /*
-        all animations call this shared animation triggering function internally.
-        The animationEvent variable refers to the JavaScript animation event that will be triggered
-        and the className value is the name of the animation that will be applied within the
-        CSS code. Element, `parentElement` and `afterElement` are provided DOM elements for the animation
-        and the onComplete callback will be fired once the animation is fully complete.
-      */
-      function performAnimation(animationEvent, className, element, parentElement, afterElement, domOperation, options, doneCallback) {
-        var noopCancel = noop;
-        var runner = animationRunner(element, animationEvent, className, options);
-        if (!runner) {
-          fireDOMOperation();
-          fireBeforeCallbackAsync();
-          fireAfterCallbackAsync();
-          closeAnimation();
-          return noopCancel;
-        }
-
-        animationEvent = runner.event;
-        className = runner.className;
-        var elementEvents = angular.element._data(runner.node);
-        elementEvents = elementEvents && elementEvents.events;
-
-        if (!parentElement) {
-          parentElement = afterElement ? afterElement.parent() : element.parent();
-        }
-
-        //skip the animation if animations are disabled, a parent is already being animated,
-        //the element is not currently attached to the document body or then completely close
-        //the animation if any matching animations are not found at all.
-        //NOTE: IE8 + IE9 should close properly (run closeAnimation()) in case an animation was found.
-        if (animationsDisabled(element, parentElement)) {
-          fireDOMOperation();
-          fireBeforeCallbackAsync();
-          fireAfterCallbackAsync();
-          closeAnimation();
-          return noopCancel;
-        }
-
-        var ngAnimateState  = element.data(NG_ANIMATE_STATE) || {};
-        var runningAnimations     = ngAnimateState.active || {};
-        var totalActiveAnimations = ngAnimateState.totalActive || 0;
-        var lastAnimation         = ngAnimateState.last;
-        var skipAnimation = false;
-
-        if (totalActiveAnimations > 0) {
-          var animationsToCancel = [];
-          if (!runner.isClassBased) {
-            if (animationEvent == 'leave' && runningAnimations['ng-leave']) {
-              skipAnimation = true;
-            } else {
-              //cancel all animations when a structural animation takes place
-              for (var klass in runningAnimations) {
-                animationsToCancel.push(runningAnimations[klass]);
-              }
-              ngAnimateState = {};
-              cleanup(element, true);
-            }
-          } else if (lastAnimation.event == 'setClass') {
-            animationsToCancel.push(lastAnimation);
-            cleanup(element, className);
-          } else if (runningAnimations[className]) {
-            var current = runningAnimations[className];
-            if (current.event == animationEvent) {
-              skipAnimation = true;
-            } else {
-              animationsToCancel.push(current);
-              cleanup(element, className);
-            }
-          }
-
-          if (animationsToCancel.length > 0) {
-            forEach(animationsToCancel, function(operation) {
-              operation.cancel();
-            });
-          }
-        }
-
-        if (runner.isClassBased
-            && !runner.isSetClassOperation
-            && animationEvent != 'animate'
-            && !skipAnimation) {
-          skipAnimation = (animationEvent == 'addClass') == element.hasClass(className); //opposite of XOR
-        }
-
-        if (skipAnimation) {
-          fireDOMOperation();
-          fireBeforeCallbackAsync();
-          fireAfterCallbackAsync();
-          fireDoneCallbackAsync();
-          return noopCancel;
-        }
-
-        runningAnimations     = ngAnimateState.active || {};
-        totalActiveAnimations = ngAnimateState.totalActive || 0;
-
-        if (animationEvent == 'leave') {
-          //there's no need to ever remove the listener since the element
-          //will be removed (destroyed) after the leave animation ends or
-          //is cancelled midway
-          element.one('$destroy', function(e) {
-            var element = angular.element(this);
-            var state = element.data(NG_ANIMATE_STATE);
-            if (state) {
-              var activeLeaveAnimation = state.active['ng-leave'];
-              if (activeLeaveAnimation) {
-                activeLeaveAnimation.cancel();
-                cleanup(element, 'ng-leave');
-              }
-            }
-          });
-        }
-
-        //the ng-animate class does nothing, but it's here to allow for
-        //parent animations to find and cancel child animations when needed
-        $$jqLite.addClass(element, NG_ANIMATE_CLASS_NAME);
-        if (options && options.tempClasses) {
-          forEach(options.tempClasses, function(className) {
-            $$jqLite.addClass(element, className);
-          });
-        }
-
-        var localAnimationCount = globalAnimationCounter++;
-        totalActiveAnimations++;
-        runningAnimations[className] = runner;
-
-        element.data(NG_ANIMATE_STATE, {
-          last: runner,
-          active: runningAnimations,
-          index: localAnimationCount,
-          totalActive: totalActiveAnimations
-        });
-
-        //first we run the before animations and when all of those are complete
-        //then we perform the DOM operation and run the next set of animations
-        fireBeforeCallbackAsync();
-        runner.before(function(cancelled) {
-          var data = element.data(NG_ANIMATE_STATE);
-          cancelled = cancelled ||
-                        !data || !data.active[className] ||
-                        (runner.isClassBased && data.active[className].event != animationEvent);
-
-          fireDOMOperation();
-          if (cancelled === true) {
-            closeAnimation();
-          } else {
-            fireAfterCallbackAsync();
-            runner.after(closeAnimation);
-          }
-        });
-
-        return runner.cancel;
-
-        function fireDOMCallback(animationPhase) {
-          var eventName = '$animate:' + animationPhase;
-          if (elementEvents && elementEvents[eventName] && elementEvents[eventName].length > 0) {
-            $$asyncCallback(function() {
-              element.triggerHandler(eventName, {
-                event: animationEvent,
-                className: className
-              });
-            });
-          }
-        }
-
-        function fireBeforeCallbackAsync() {
-          fireDOMCallback('before');
-        }
-
-        function fireAfterCallbackAsync() {
-          fireDOMCallback('after');
-        }
-
-        function fireDoneCallbackAsync() {
-          fireDOMCallback('close');
-          doneCallback();
-        }
-
-        //it is less complicated to use a flag than managing and canceling
-        //timeouts containing multiple callbacks.
-        function fireDOMOperation() {
-          if (!fireDOMOperation.hasBeenRun) {
-            fireDOMOperation.hasBeenRun = true;
-            domOperation();
-          }
-        }
-
-        function closeAnimation() {
-          if (!closeAnimation.hasBeenRun) {
-            if (runner) { //the runner doesn't exist if it fails to instantiate
-              runner.applyStyles();
-            }
-
-            closeAnimation.hasBeenRun = true;
-            if (options && options.tempClasses) {
-              forEach(options.tempClasses, function(className) {
-                $$jqLite.removeClass(element, className);
-              });
-            }
-
-            var data = element.data(NG_ANIMATE_STATE);
-            if (data) {
-
-              /* only structural animations wait for reflow before removing an
-                 animation, but class-based animations don't. An example of this
-                 failing would be when a parent HTML tag has a ng-class attribute
-                 causing ALL directives below to skip animations during the digest */
-              if (runner && runner.isClassBased) {
-                cleanup(element, className);
-              } else {
-                $$asyncCallback(function() {
-                  var data = element.data(NG_ANIMATE_STATE) || {};
-                  if (localAnimationCount == data.index) {
-                    cleanup(element, className, animationEvent);
-                  }
-                });
-                element.data(NG_ANIMATE_STATE, data);
-              }
-            }
-            fireDoneCallbackAsync();
-          }
-        }
-      }
-
-      function cancelChildAnimations(element) {
-        var node = extractElementNode(element);
-        if (node) {
-          var nodes = angular.isFunction(node.getElementsByClassName) ?
-            node.getElementsByClassName(NG_ANIMATE_CLASS_NAME) :
-            node.querySelectorAll('.' + NG_ANIMATE_CLASS_NAME);
-          forEach(nodes, function(element) {
-            element = angular.element(element);
-            var data = element.data(NG_ANIMATE_STATE);
-            if (data && data.active) {
-              forEach(data.active, function(runner) {
-                runner.cancel();
-              });
-            }
-          });
-        }
-      }
-
-      function cleanup(element, className) {
-        if (isMatchingElement(element, $rootElement)) {
-          if (!rootAnimateState.disabled) {
-            rootAnimateState.running = false;
-            rootAnimateState.structural = false;
-          }
-        } else if (className) {
-          var data = element.data(NG_ANIMATE_STATE) || {};
-
-          var removeAnimations = className === true;
-          if (!removeAnimations && data.active && data.active[className]) {
-            data.totalActive--;
-            delete data.active[className];
-          }
-
-          if (removeAnimations || !data.totalActive) {
-            $$jqLite.removeClass(element, NG_ANIMATE_CLASS_NAME);
-            element.removeData(NG_ANIMATE_STATE);
-          }
-        }
-      }
-
-      function animationsDisabled(element, parentElement) {
-        if (rootAnimateState.disabled) {
-          return true;
-        }
-
-        if (isMatchingElement(element, $rootElement)) {
-          return rootAnimateState.running;
-        }
-
-        var allowChildAnimations, parentRunningAnimation, hasParent;
-        do {
-          //the element did not reach the root element which means that it
-          //is not apart of the DOM. Therefore there is no reason to do
-          //any animations on it
-          if (parentElement.length === 0) break;
-
-          var isRoot = isMatchingElement(parentElement, $rootElement);
-          var state = isRoot ? rootAnimateState : (parentElement.data(NG_ANIMATE_STATE) || {});
-          if (state.disabled) {
-            return true;
-          }
-
-          //no matter what, for an animation to work it must reach the root element
-          //this implies that the element is attached to the DOM when the animation is run
-          if (isRoot) {
-            hasParent = true;
-          }
-
-          //once a flag is found that is strictly false then everything before
-          //it will be discarded and all child animations will be restricted
-          if (allowChildAnimations !== false) {
-            var animateChildrenFlag = parentElement.data(NG_ANIMATE_CHILDREN);
-            if (angular.isDefined(animateChildrenFlag)) {
-              allowChildAnimations = animateChildrenFlag;
-            }
-          }
-
-          parentRunningAnimation = parentRunningAnimation ||
-                                   state.running ||
-                                   (state.last && !state.last.isClassBased);
-        }
-        while (parentElement = parentElement.parent());
-
-        return !hasParent || (!allowChildAnimations && parentRunningAnimation);
-      }
-    }]);
-
-    $animateProvider.register('', ['$window', '$sniffer', '$timeout', '$$animateReflow',
-                           function($window,   $sniffer,   $timeout,   $$animateReflow) {
-      // Detect proper transitionend/animationend event names.
-      var CSS_PREFIX = '', TRANSITION_PROP, TRANSITIONEND_EVENT, ANIMATION_PROP, ANIMATIONEND_EVENT;
-
-      // If unprefixed events are not supported but webkit-prefixed are, use the latter.
-      // Otherwise, just use W3C names, browsers not supporting them at all will just ignore them.
-      // Note: Chrome implements `window.onwebkitanimationend` and doesn't implement `window.onanimationend`
-      // but at the same time dispatches the `animationend` event and not `webkitAnimationEnd`.
-      // Register both events in case `window.onanimationend` is not supported because of that,
-      // do the same for `transitionend` as Safari is likely to exhibit similar behavior.
-      // Also, the only modern browser that uses vendor prefixes for transitions/keyframes is webkit
-      // therefore there is no reason to test anymore for other vendor prefixes: http://caniuse.com/#search=transition
-      if (window.ontransitionend === undefined && window.onwebkittransitionend !== undefined) {
-        CSS_PREFIX = '-webkit-';
-        TRANSITION_PROP = 'WebkitTransition';
-        TRANSITIONEND_EVENT = 'webkitTransitionEnd transitionend';
-      } else {
-        TRANSITION_PROP = 'transition';
-        TRANSITIONEND_EVENT = 'transitionend';
-      }
-
-      if (window.onanimationend === undefined && window.onwebkitanimationend !== undefined) {
-        CSS_PREFIX = '-webkit-';
-        ANIMATION_PROP = 'WebkitAnimation';
-        ANIMATIONEND_EVENT = 'webkitAnimationEnd animationend';
-      } else {
-        ANIMATION_PROP = 'animation';
-        ANIMATIONEND_EVENT = 'animationend';
-      }
-
-      var DURATION_KEY = 'Duration';
-      var PROPERTY_KEY = 'Property';
-      var DELAY_KEY = 'Delay';
-      var ANIMATION_ITERATION_COUNT_KEY = 'IterationCount';
-      var ANIMATION_PLAYSTATE_KEY = 'PlayState';
-      var NG_ANIMATE_PARENT_KEY = '$$ngAnimateKey';
-      var NG_ANIMATE_CSS_DATA_KEY = '$$ngAnimateCSS3Data';
-      var ELAPSED_TIME_MAX_DECIMAL_PLACES = 3;
-      var CLOSING_TIME_BUFFER = 1.5;
-      var ONE_SECOND = 1000;
-
-      var lookupCache = {};
-      var parentCounter = 0;
-      var animationReflowQueue = [];
-      var cancelAnimationReflow;
-      function clearCacheAfterReflow() {
-        if (!cancelAnimationReflow) {
-          cancelAnimationReflow = $$animateReflow(function() {
-            animationReflowQueue = [];
-            cancelAnimationReflow = null;
-            lookupCache = {};
-          });
-        }
-      }
-
-      function afterReflow(element, callback) {
-        if (cancelAnimationReflow) {
-          cancelAnimationReflow();
-        }
-        animationReflowQueue.push(callback);
-        cancelAnimationReflow = $$animateReflow(function() {
-          forEach(animationReflowQueue, function(fn) {
-            fn();
-          });
-
-          animationReflowQueue = [];
-          cancelAnimationReflow = null;
-          lookupCache = {};
-        });
-      }
-
-      var closingTimer = null;
-      var closingTimestamp = 0;
-      var animationElementQueue = [];
-      function animationCloseHandler(element, totalTime) {
-        var node = extractElementNode(element);
-        element = angular.element(node);
-
-        //this item will be garbage collected by the closing
-        //animation timeout
-        animationElementQueue.push(element);
-
-        //but it may not need to cancel out the existing timeout
-        //if the timestamp is less than the previous one
-        var futureTimestamp = Date.now() + totalTime;
-        if (futureTimestamp <= closingTimestamp) {
-          return;
-        }
-
-        $timeout.cancel(closingTimer);
-
-        closingTimestamp = futureTimestamp;
-        closingTimer = $timeout(function() {
-          closeAllAnimations(animationElementQueue);
-          animationElementQueue = [];
-        }, totalTime, false);
-      }
-
-      function closeAllAnimations(elements) {
-        forEach(elements, function(element) {
-          var elementData = element.data(NG_ANIMATE_CSS_DATA_KEY);
-          if (elementData) {
-            forEach(elementData.closeAnimationFns, function(fn) {
-              fn();
-            });
-          }
-        });
-      }
-
-      function getElementAnimationDetails(element, cacheKey) {
-        var data = cacheKey ? lookupCache[cacheKey] : null;
-        if (!data) {
-          var transitionDuration = 0;
-          var transitionDelay = 0;
-          var animationDuration = 0;
-          var animationDelay = 0;
-
-          //we want all the styles defined before and after
-          forEach(element, function(element) {
-            if (element.nodeType == ELEMENT_NODE) {
-              var elementStyles = $window.getComputedStyle(element) || {};
-
-              var transitionDurationStyle = elementStyles[TRANSITION_PROP + DURATION_KEY];
-              transitionDuration = Math.max(parseMaxTime(transitionDurationStyle), transitionDuration);
-
-              var transitionDelayStyle = elementStyles[TRANSITION_PROP + DELAY_KEY];
-              transitionDelay  = Math.max(parseMaxTime(transitionDelayStyle), transitionDelay);
-
-              var animationDelayStyle = elementStyles[ANIMATION_PROP + DELAY_KEY];
-              animationDelay   = Math.max(parseMaxTime(elementStyles[ANIMATION_PROP + DELAY_KEY]), animationDelay);
-
-              var aDuration  = parseMaxTime(elementStyles[ANIMATION_PROP + DURATION_KEY]);
-
-              if (aDuration > 0) {
-                aDuration *= parseInt(elementStyles[ANIMATION_PROP + ANIMATION_ITERATION_COUNT_KEY], 10) || 1;
-              }
-              animationDuration = Math.max(aDuration, animationDuration);
-            }
-          });
-          data = {
-            total: 0,
-            transitionDelay: transitionDelay,
-            transitionDuration: transitionDuration,
-            animationDelay: animationDelay,
-            animationDuration: animationDuration
-          };
-          if (cacheKey) {
-            lookupCache[cacheKey] = data;
-          }
-        }
-        return data;
-      }
-
-      function parseMaxTime(str) {
-        var maxValue = 0;
-        var values = isString(str) ?
-          str.split(/\s*,\s*/) :
-          [];
-        forEach(values, function(value) {
-          maxValue = Math.max(parseFloat(value) || 0, maxValue);
-        });
-        return maxValue;
-      }
-
-      function getCacheKey(element) {
-        var parentElement = element.parent();
-        var parentID = parentElement.data(NG_ANIMATE_PARENT_KEY);
-        if (!parentID) {
-          parentElement.data(NG_ANIMATE_PARENT_KEY, ++parentCounter);
-          parentID = parentCounter;
-        }
-        return parentID + '-' + extractElementNode(element).getAttribute('class');
-      }
-
-      function animateSetup(animationEvent, element, className, styles) {
-        var structural = ['ng-enter','ng-leave','ng-move'].indexOf(className) >= 0;
-
-        var cacheKey = getCacheKey(element);
-        var eventCacheKey = cacheKey + ' ' + className;
-        var itemIndex = lookupCache[eventCacheKey] ? ++lookupCache[eventCacheKey].total : 0;
-
-        var stagger = {};
-        if (itemIndex > 0) {
-          var staggerClassName = className + '-stagger';
-          var staggerCacheKey = cacheKey + ' ' + staggerClassName;
-          var applyClasses = !lookupCache[staggerCacheKey];
-
-          applyClasses && $$jqLite.addClass(element, staggerClassName);
-
-          stagger = getElementAnimationDetails(element, staggerCacheKey);
-
-          applyClasses && $$jqLite.removeClass(element, staggerClassName);
-        }
-
-        $$jqLite.addClass(element, className);
-
-        var formerData = element.data(NG_ANIMATE_CSS_DATA_KEY) || {};
-        var timings = getElementAnimationDetails(element, eventCacheKey);
-        var transitionDuration = timings.transitionDuration;
-        var animationDuration = timings.animationDuration;
-
-        if (structural && transitionDuration === 0 && animationDuration === 0) {
-          $$jqLite.removeClass(element, className);
-          return false;
-        }
-
-        var blockTransition = styles || (structural && transitionDuration > 0);
-        var blockAnimation = animationDuration > 0 &&
-                             stagger.animationDelay > 0 &&
-                             stagger.animationDuration === 0;
-
-        var closeAnimationFns = formerData.closeAnimationFns || [];
-        element.data(NG_ANIMATE_CSS_DATA_KEY, {
-          stagger: stagger,
-          cacheKey: eventCacheKey,
-          running: formerData.running || 0,
-          itemIndex: itemIndex,
-          blockTransition: blockTransition,
-          closeAnimationFns: closeAnimationFns
-        });
-
-        var node = extractElementNode(element);
-
-        if (blockTransition) {
-          blockTransitions(node, true);
-          if (styles) {
-            element.css(styles);
-          }
-        }
-
-        if (blockAnimation) {
-          blockAnimations(node, true);
-        }
-
-        return true;
-      }
-
-      function animateRun(animationEvent, element, className, activeAnimationComplete, styles) {
-        var node = extractElementNode(element);
-        var elementData = element.data(NG_ANIMATE_CSS_DATA_KEY);
-        if (node.getAttribute('class').indexOf(className) == -1 || !elementData) {
-          activeAnimationComplete();
-          return;
-        }
-
-        var activeClassName = '';
-        var pendingClassName = '';
-        forEach(className.split(' '), function(klass, i) {
-          var prefix = (i > 0 ? ' ' : '') + klass;
-          activeClassName += prefix + '-active';
-          pendingClassName += prefix + '-pending';
-        });
-
-        var style = '';
-        var appliedStyles = [];
-        var itemIndex = elementData.itemIndex;
-        var stagger = elementData.stagger;
-        var staggerTime = 0;
-        if (itemIndex > 0) {
-          var transitionStaggerDelay = 0;
-          if (stagger.transitionDelay > 0 && stagger.transitionDuration === 0) {
-            transitionStaggerDelay = stagger.transitionDelay * itemIndex;
-          }
-
-          var animationStaggerDelay = 0;
-          if (stagger.animationDelay > 0 && stagger.animationDuration === 0) {
-            animationStaggerDelay = stagger.animationDelay * itemIndex;
-            appliedStyles.push(CSS_PREFIX + 'animation-play-state');
-          }
-
-          staggerTime = Math.round(Math.max(transitionStaggerDelay, animationStaggerDelay) * 100) / 100;
-        }
-
-        if (!staggerTime) {
-          $$jqLite.addClass(element, activeClassName);
-          if (elementData.blockTransition) {
-            blockTransitions(node, false);
-          }
-        }
-
-        var eventCacheKey = elementData.cacheKey + ' ' + activeClassName;
-        var timings = getElementAnimationDetails(element, eventCacheKey);
-        var maxDuration = Math.max(timings.transitionDuration, timings.animationDuration);
-        if (maxDuration === 0) {
-          $$jqLite.removeClass(element, activeClassName);
-          animateClose(element, className);
-          activeAnimationComplete();
-          return;
-        }
-
-        if (!staggerTime && styles && Object.keys(styles).length > 0) {
-          if (!timings.transitionDuration) {
-            element.css('transition', timings.animationDuration + 's linear all');
-            appliedStyles.push('transition');
-          }
-          element.css(styles);
-        }
-
-        var maxDelay = Math.max(timings.transitionDelay, timings.animationDelay);
-        var maxDelayTime = maxDelay * ONE_SECOND;
-
-        if (appliedStyles.length > 0) {
-          //the element being animated may sometimes contain comment nodes in
-          //the jqLite object, so we're safe to use a single variable to house
-          //the styles since there is always only one element being animated
-          var oldStyle = node.getAttribute('style') || '';
-          if (oldStyle.charAt(oldStyle.length - 1) !== ';') {
-            oldStyle += ';';
-          }
-          node.setAttribute('style', oldStyle + ' ' + style);
-        }
-
-        var startTime = Date.now();
-        var css3AnimationEvents = ANIMATIONEND_EVENT + ' ' + TRANSITIONEND_EVENT;
-        var animationTime     = (maxDelay + maxDuration) * CLOSING_TIME_BUFFER;
-        var totalTime         = (staggerTime + animationTime) * ONE_SECOND;
-
-        var staggerTimeout;
-        if (staggerTime > 0) {
-          $$jqLite.addClass(element, pendingClassName);
-          staggerTimeout = $timeout(function() {
-            staggerTimeout = null;
-
-            if (timings.transitionDuration > 0) {
-              blockTransitions(node, false);
-            }
-            if (timings.animationDuration > 0) {
-              blockAnimations(node, false);
-            }
-
-            $$jqLite.addClass(element, activeClassName);
-            $$jqLite.removeClass(element, pendingClassName);
-
-            if (styles) {
-              if (timings.transitionDuration === 0) {
-                element.css('transition', timings.animationDuration + 's linear all');
-              }
-              element.css(styles);
-              appliedStyles.push('transition');
-            }
-          }, staggerTime * ONE_SECOND, false);
-        }
-
-        element.on(css3AnimationEvents, onAnimationProgress);
-        elementData.closeAnimationFns.push(function() {
-          onEnd();
-          activeAnimationComplete();
-        });
-
-        elementData.running++;
-        animationCloseHandler(element, totalTime);
-        return onEnd;
-
-        // This will automatically be called by $animate so
-        // there is no need to attach this internally to the
-        // timeout done method.
-        function onEnd() {
-          element.off(css3AnimationEvents, onAnimationProgress);
-          $$jqLite.removeClass(element, activeClassName);
-          $$jqLite.removeClass(element, pendingClassName);
-          if (staggerTimeout) {
-            $timeout.cancel(staggerTimeout);
-          }
-          animateClose(element, className);
-          var node = extractElementNode(element);
-          for (var i in appliedStyles) {
-            node.style.removeProperty(appliedStyles[i]);
-          }
-        }
-
-        function onAnimationProgress(event) {
-          event.stopPropagation();
-          var ev = event.originalEvent || event;
-          var timeStamp = ev.$manualTimeStamp || ev.timeStamp || Date.now();
-
-          /* Firefox (or possibly just Gecko) likes to not round values up
-           * when a ms measurement is used for the animation */
-          var elapsedTime = parseFloat(ev.elapsedTime.toFixed(ELAPSED_TIME_MAX_DECIMAL_PLACES));
-
-          /* $manualTimeStamp is a mocked timeStamp value which is set
-           * within browserTrigger(). This is only here so that tests can
-           * mock animations properly. Real events fallback to event.timeStamp,
-           * or, if they don't, then a timeStamp is automatically created for them.
-           * We're checking to see if the timeStamp surpasses the expected delay,
-           * but we're using elapsedTime instead of the timeStamp on the 2nd
-           * pre-condition since animations sometimes close off early */
-          if (Math.max(timeStamp - startTime, 0) >= maxDelayTime && elapsedTime >= maxDuration) {
-            activeAnimationComplete();
-          }
-        }
-      }
-
-      function blockTransitions(node, bool) {
-        node.style[TRANSITION_PROP + PROPERTY_KEY] = bool ? 'none' : '';
-      }
-
-      function blockAnimations(node, bool) {
-        node.style[ANIMATION_PROP + ANIMATION_PLAYSTATE_KEY] = bool ? 'paused' : '';
-      }
-
-      function animateBefore(animationEvent, element, className, styles) {
-        if (animateSetup(animationEvent, element, className, styles)) {
-          return function(cancelled) {
-            cancelled && animateClose(element, className);
-          };
-        }
-      }
-
-      function animateAfter(animationEvent, element, className, afterAnimationComplete, styles) {
-        if (element.data(NG_ANIMATE_CSS_DATA_KEY)) {
-          return animateRun(animationEvent, element, className, afterAnimationComplete, styles);
-        } else {
-          animateClose(element, className);
-          afterAnimationComplete();
-        }
-      }
-
-      function animate(animationEvent, element, className, animationComplete, options) {
-        //If the animateSetup function doesn't bother returning a
-        //cancellation function then it means that there is no animation
-        //to perform at all
-        var preReflowCancellation = animateBefore(animationEvent, element, className, options.from);
-        if (!preReflowCancellation) {
-          clearCacheAfterReflow();
-          animationComplete();
-          return;
-        }
-
-        //There are two cancellation functions: one is before the first
-        //reflow animation and the second is during the active state
-        //animation. The first function will take care of removing the
-        //data from the element which will not make the 2nd animation
-        //happen in the first place
-        var cancel = preReflowCancellation;
-        afterReflow(element, function() {
-          //once the reflow is complete then we point cancel to
-          //the new cancellation function which will remove all of the
-          //animation properties from the active animation
-          cancel = animateAfter(animationEvent, element, className, animationComplete, options.to);
-        });
-
-        return function(cancelled) {
-          (cancel || noop)(cancelled);
-        };
-      }
-
-      function animateClose(element, className) {
-        $$jqLite.removeClass(element, className);
-        var data = element.data(NG_ANIMATE_CSS_DATA_KEY);
-        if (data) {
-          if (data.running) {
-            data.running--;
-          }
-          if (!data.running || data.running === 0) {
-            element.removeData(NG_ANIMATE_CSS_DATA_KEY);
-          }
-        }
-      }
-
-      return {
-        animate: function(element, className, from, to, animationCompleted, options) {
-          options = options || {};
-          options.from = from;
-          options.to = to;
-          return animate('animate', element, className, animationCompleted, options);
-        },
-
-        enter: function(element, animationCompleted, options) {
-          options = options || {};
-          return animate('enter', element, 'ng-enter', animationCompleted, options);
-        },
-
-        leave: function(element, animationCompleted, options) {
-          options = options || {};
-          return animate('leave', element, 'ng-leave', animationCompleted, options);
-        },
-
-        move: function(element, animationCompleted, options) {
-          options = options || {};
-          return animate('move', element, 'ng-move', animationCompleted, options);
-        },
-
-        beforeSetClass: function(element, add, remove, animationCompleted, options) {
-          options = options || {};
-          var className = suffixClasses(remove, '-remove') + ' ' +
-                          suffixClasses(add, '-add');
-          var cancellationMethod = animateBefore('setClass', element, className, options.from);
-          if (cancellationMethod) {
-            afterReflow(element, animationCompleted);
-            return cancellationMethod;
-          }
-          clearCacheAfterReflow();
-          animationCompleted();
-        },
-
-        beforeAddClass: function(element, className, animationCompleted, options) {
-          options = options || {};
-          var cancellationMethod = animateBefore('addClass', element, suffixClasses(className, '-add'), options.from);
-          if (cancellationMethod) {
-            afterReflow(element, animationCompleted);
-            return cancellationMethod;
-          }
-          clearCacheAfterReflow();
-          animationCompleted();
-        },
-
-        beforeRemoveClass: function(element, className, animationCompleted, options) {
-          options = options || {};
-          var cancellationMethod = animateBefore('removeClass', element, suffixClasses(className, '-remove'), options.from);
-          if (cancellationMethod) {
-            afterReflow(element, animationCompleted);
-            return cancellationMethod;
-          }
-          clearCacheAfterReflow();
-          animationCompleted();
-        },
-
-        setClass: function(element, add, remove, animationCompleted, options) {
-          options = options || {};
-          remove = suffixClasses(remove, '-remove');
-          add = suffixClasses(add, '-add');
-          var className = remove + ' ' + add;
-          return animateAfter('setClass', element, className, animationCompleted, options.to);
-        },
-
-        addClass: function(element, className, animationCompleted, options) {
-          options = options || {};
-          return animateAfter('addClass', element, suffixClasses(className, '-add'), animationCompleted, options.to);
-        },
-
-        removeClass: function(element, className, animationCompleted, options) {
-          options = options || {};
-          return animateAfter('removeClass', element, suffixClasses(className, '-remove'), animationCompleted, options.to);
-        }
-      };
-
-      function suffixClasses(classes, suffix) {
-        var className = '';
-        classes = isArray(classes) ? classes : classes.split(/\s+/);
-        forEach(classes, function(klass, i) {
-          if (klass && klass.length > 0) {
-            className += (i > 0 ? ' ' : '') + klass + suffix;
-          }
-        });
-        return className;
-      }
-    }]);
-  }]);
diff --git a/src/ngAnimate/animateChildrenDirective.js b/src/ngAnimate/animateChildrenDirective.js
new file mode 100644
index 000000000000..3962a632d890
--- /dev/null
+++ b/src/ngAnimate/animateChildrenDirective.js
@@ -0,0 +1,15 @@
+'use strict';
+
+var $$AnimateChildrenDirective = [function() {
+  return function(scope, element, attrs) {
+    var val = attrs.ngAnimateChildren;
+    if (angular.isString(val) && val.length === 0) { //empty attribute
+      element.data(NG_ANIMATE_CHILDREN_DATA, true);
+    } else {
+      attrs.$observe('ngAnimateChildren', function(value) {
+        value = value === 'on' || value === 'true';
+        element.data(NG_ANIMATE_CHILDREN_DATA, value);
+      });
+    }
+  };
+}];
diff --git a/src/ngAnimate/animateCss.js b/src/ngAnimate/animateCss.js
new file mode 100644
index 000000000000..ecdfb9436ea5
--- /dev/null
+++ b/src/ngAnimate/animateCss.js
@@ -0,0 +1,900 @@
+'use strict';
+
+/**
+ * @ngdoc service
+ * @name $animateCss
+ * @kind object
+ *
+ * @description
+ * The `$animateCss` service is a useful utility to trigger customized CSS-based transitions/keyframes
+ * from a JavaScript-based animation or directly from a directive. The purpose of `$animateCss` is NOT
+ * to side-step how `$animate` and ngAnimate work, but the goal is to allow pre-existing animations or
+ * directives to create more complex animations that can be purely driven using CSS code.
+ *
+ * Note that only browsers that support CSS transitions and/or keyframe animations are capable of
+ * rendering animations triggered via `$animateCss` (bad news for IE9 and lower).
+ *
+ * ## Usage
+ * Once again, `$animateCss` is designed to be used inside of a registered JavaScript animation that
+ * is powered by ngAnimate. It is possible to use `$animateCss` directly inside of a directive, however,
+ * any automatic control over cancelling animations and/or preventing animations from being run on
+ * child elements will not be handled by Angular. For this to work as expected, please use `$animate` to
+ * trigger the animation and then setup a JavaScript animation that injects `$animateCss` to trigger
+ * the CSS animation.
+ *
+ * The example below shows how we can create a folding animation on an element using `ng-if`:
+ *
+ * ```html
+ * <!-- notice the `fold-animation` CSS class -->
+ * <div ng-if="onOff" class="fold-animation">
+ *   This element will go BOOM
+ * </div>
+ * <button ng-click="onOff=true">Fold In</button>
+ * ```
+ *
+ * Now we create the **JavaScript animation** that will trigger the CSS transition:
+ *
+ * ```js
+ * ngModule.animation('.fold-animation', ['$animateCss', function($animateCss) {
+ *   return {
+ *     enter: function(element, doneFn) {
+ *       var height = element[0].offsetHeight;
+ *       return $animateCss(element, {
+ *         from: { height:'0px' },
+ *         to: { height:height + 'px' },
+ *         duration: 1 // one second
+ *       });
+ *     }
+ *   }
+ * }]);
+ * ```
+ *
+ * ## More Advanced Uses
+ *
+ * `$animateCss` is the underlying code that ngAnimate uses to power **CSS-based animations** behind the scenes. Therefore CSS hooks
+ * like `.ng-EVENT`, `.ng-EVENT-active`, `.ng-EVENT-stagger` are all features that can be triggered using `$animateCss` via JavaScript code.
+ *
+ * This also means that just about any combination of adding classes, removing classes, setting styles, dynamically setting a keyframe animation,
+ * applying a hardcoded duration or delay value, changing the animation easing or applying a stagger animation are all options that work with
+ * `$animateCss`. The service itself is smart enough to figure out the combination of options and examine the element styling properties in order
+ * to provide a working animation that will run in CSS.
+ *
+ * The example below showcases a more advanced version of the `.fold-animation` from the example above:
+ *
+ * ```js
+ * ngModule.animation('.fold-animation', ['$animateCss', function($animateCss) {
+ *   return {
+ *     enter: function(element, doneFn) {
+ *       var height = element[0].offsetHeight;
+ *       return $animateCss(element, {
+ *         addClass: 'red large-text pulse-twice',
+ *         easing: 'ease-out',
+ *         from: { height:'0px' },
+ *         to: { height:height + 'px' },
+ *         duration: 1 // one second
+ *       });
+ *     }
+ *   }
+ * }]);
+ * ```
+ *
+ * Since we're adding/removing CSS classes then the CSS transition will also pick those up:
+ *
+ * ```css
+ * /&#42; since a hardcoded duration value of 1 was provided in the JavaScript animation code,
+ * the CSS classes below will be transitioned despite them being defined as regular CSS classes &#42;/
+ * .red { background:red; }
+ * .large-text { font-size:20px; }
+ *
+ * /&#42; we can also use a keyframe animation and $animateCss will make it work alongside the transition &#42;/
+ * .pulse-twice {
+ *   animation: 0.5s pulse linear 2;
+ *   -webkit-animation: 0.5s pulse linear 2;
+ * }
+ *
+ * @keyframes pulse {
+ *   from { transform: scale(0.5); }
+ *   to { transform: scale(1.5); }
+ * }
+ *
+ * @-webkit-keyframes pulse {
+ *   from { -webkit-transform: scale(0.5); }
+ *   to { -webkit-transform: scale(1.5); }
+ * }
+ * ```
+ *
+ * Given this complex combination of CSS classes, styles and options, `$animateCss` will figure everything out and make the animation happen.
+ *
+ * ## How the Options are handled
+ *
+ * `$animateCss` is very versatile and intelligent when it comes to figuring out what configurations to apply to the element to ensure the animation
+ * works with the options provided. Say for example we were adding a class that contained a keyframe value and we wanted to also animate some inline
+ * styles using the `from` and `to` properties.
+ *
+ * ```js
+ * var animator = $animateCss(element, {
+ *   from: { background:'red' },
+ *   to: { background:'blue' }
+ * });
+ * animator.start();
+ * ```
+ *
+ * ```css
+ * .rotating-animation {
+ *   animation:0.5s rotate linear;
+ *   -webkit-animation:0.5s rotate linear;
+ * }
+ *
+ * @keyframes rotate {
+ *   from { transform: rotate(0deg); }
+ *   to { transform: rotate(360deg); }
+ * }
+ *
+ * @-webkit-keyframes rotate {
+ *   from { -webkit-transform: rotate(0deg); }
+ *   to { -webkit-transform: rotate(360deg); }
+ * }
+ * ```
+ *
+ * The missing pieces here are that we do not have a transition set (within the CSS code nor within the `$animateCss` options) and the duration of the animation is
+ * going to be detected from what the keyframe styles on the CSS class are. In this event, `$animateCss` will automatically create an inline transition
+ * style matching the duration detected from the keyframe style (which is present in the CSS class that is being added) and then prepare both the transition
+ * and keyframe animations to run in parallel on the element. Then when the animation is underway the provided `from` and `to` CSS styles will be applied
+ * and spread across the transition and keyframe animation.
+ *
+ * ## What is returned
+ *
+ * `$animateCss` works in two stages: a preparation phase and an animation phase. Therefore when `$animateCss` is first called it will NOT actually
+ * start the animation. All that is going on here is that the element is being prepared for the animation (which means that the generated CSS classes are
+ * added and removed on the element). Once `$animateCss` is called it will return an object with the following properties:
+ *
+ * ```js
+ * var animator = $animateCss(element, { ... });
+ * ```
+ *
+ * Now what do the contents of our `animator` variable look like:
+ *
+ * ```js
+ * {
+ *   // starts the animation
+ *   start: Function,
+ *
+ *   // ends (aborts) the animation
+ *   end: Function
+ * }
+ * ```
+ *
+ * To actually start the animation we need to run `animation.start()` which will then return a promise that we can hook into to detect when the animation ends.
+ * If we choose not to run the animation then we MUST run `animation.end()` to perform a cleanup on the element (since some CSS classes and stlyes may have been
+ * applied to the element during the preparation phase). Note that all other properties such as duration, delay, transitions and keyframes are just properties
+ * and that changing them will not reconfigure the parameters of the animation.
+ *
+ * ### runner.done() vs runner.then()
+ * It is documented that `animation.start()` will return a promise object and this is true, however, there is also an additional method available on the
+ * runner called `.done(callbackFn)`. The done method works the same as `.finally(callbackFn)`, however, it does **not trigger a digest to occur**.
+ * Therefore, for performance reasons, it's always best to use `runner.done(callback)` instead of `runner.then()`, `runner.catch()` or `runner.finally()`
+ * unless you really need a digest to kick off afterwards.
+ *
+ * Keep in mind that, to make this easier, ngAnimate has tweaked the JS animations API to recognize when a runner instance is returned from $animateCss
+ * (so there is no need to call `runner.done(doneFn)` inside of your JavaScript animation code).
+ * Check the {@link ngAnimate.$animateCss#usage animation code above} to see how this works.
+ *
+ * @param {DOMElement} element the element that will be animated
+ * @param {object} options the animation-related options that will be applied during the animation
+ *
+ * * `event` - The DOM event (e.g. enter, leave, move). When used, a generated CSS class of `ng-EVENT` and `ng-EVENT-active` will be applied
+ * to the element during the animation. Multiple events can be provided when spaces are used as a separator. (Note that this will not perform any DOM operation.)
+ * * `easing` - The CSS easing value that will be applied to the transition or keyframe animation (or both).
+ * * `transition` - The raw CSS transition style that will be used (e.g. `1s linear all`).
+ * * `keyframeStyle` - The raw CSS keyframe animation style that will be used (e.g. `1s my_animation linear`).
+ * * `from` - The starting CSS styles (a key/value object) that will be applied at the start of the animation.
+ * * `to` - The ending CSS styles (a key/value object) that will be applied across the animation via a CSS transition.
+ * * `addClass` - A space separated list of CSS classes that will be added to the element and spread across the animation.
+ * * `removeClass` - A space separated list of CSS classes that will be removed from the element and spread across the animation.
+ * * `duration` - A number value representing the total duration of the transition and/or keyframe (note that a value of 1 is 1000ms). If a value of `0`
+ * is provided then the animation will be skipped entirely.
+ * * `delay` - A number value representing the total delay of the transition and/or keyframe (note that a value of 1 is 1000ms). If a value of `true` is
+ * used then whatever delay value is detected from the CSS classes will be mirrored on the elements styles (e.g. by setting delay true then the style value
+ * of the element will be `transition-delay: DETECTED_VALUE`). Using `true` is useful when you want the CSS classes and inline styles to all share the same
+ * CSS delay value.
+ * * `stagger` - A numeric time value representing the delay between successively animated elements
+ * ({@link ngAnimate#css-staggering-animations Click here to learn how CSS-based staggering works in ngAnimate.})
+ * * `staggerIndex` - The numeric index representing the stagger item (e.g. a value of 5 is equal to the sixth item in the stagger; therefore when a
+ * * `stagger` option value of `0.1` is used then there will be a stagger delay of `600ms`)
+ * * `applyClassesEarly` - Whether or not the classes being added or removed will be used when detecting the animation. This is set by `$animate` when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time. (Note that this will prevent any transitions from occuring on the classes being added and removed.)
+ *
+ * @return {object} an object with start and end methods and details about the animation.
+ *
+ * * `start` - The method to start the animation. This will return a `Promise` when called.
+ * * `end` - This method will cancel the animation and remove all applied CSS classes and styles.
+ */
+var ONE_SECOND = 1000;
+var BASE_TEN = 10;
+
+var ELAPSED_TIME_MAX_DECIMAL_PLACES = 3;
+var CLOSING_TIME_BUFFER = 1.5;
+
+var DETECT_CSS_PROPERTIES = {
+  transitionDuration:      TRANSITION_DURATION_PROP,
+  transitionDelay:         TRANSITION_DELAY_PROP,
+  transitionProperty:      TRANSITION_PROP + PROPERTY_KEY,
+  animationDuration:       ANIMATION_DURATION_PROP,
+  animationDelay:          ANIMATION_DELAY_PROP,
+  animationIterationCount: ANIMATION_PROP + ANIMATION_ITERATION_COUNT_KEY
+};
+
+var DETECT_STAGGER_CSS_PROPERTIES = {
+  transitionDuration:      TRANSITION_DURATION_PROP,
+  transitionDelay:         TRANSITION_DELAY_PROP,
+  animationDuration:       ANIMATION_DURATION_PROP,
+  animationDelay:          ANIMATION_DELAY_PROP
+};
+
+function getCssKeyframeDurationStyle(duration) {
+  return [ANIMATION_DURATION_PROP, duration + 's'];
+}
+
+function getCssDelayStyle(delay, isKeyframeAnimation) {
+  var prop = isKeyframeAnimation ? ANIMATION_DELAY_PROP : TRANSITION_DELAY_PROP;
+  return [prop, delay + 's'];
+}
+
+function computeCssStyles($window, element, properties) {
+  var styles = Object.create(null);
+  var detectedStyles = $window.getComputedStyle(element) || {};
+  forEach(properties, function(formalStyleName, actualStyleName) {
+    var val = detectedStyles[formalStyleName];
+    if (val) {
+      var c = val.charAt(0);
+
+      // only numerical-based values have a negative sign or digit as the first value
+      if (c === '-' || c === '+' || c >= 0) {
+        val = parseMaxTime(val);
+      }
+
+      // by setting this to null in the event that the delay is not set or is set directly as 0
+      // then we can still allow for zegative values to be used later on and not mistake this
+      // value for being greater than any other negative value.
+      if (val === 0) {
+        val = null;
+      }
+      styles[actualStyleName] = val;
+    }
+  });
+
+  return styles;
+}
+
+function parseMaxTime(str) {
+  var maxValue = 0;
+  var values = str.split(/\s*,\s*/);
+  forEach(values, function(value) {
+    // it's always safe to consider only second values and omit `ms` values since
+    // getComputedStyle will always handle the conversion for us
+    if (value.charAt(value.length - 1) == 's') {
+      value = value.substring(0, value.length - 1);
+    }
+    value = parseFloat(value) || 0;
+    maxValue = maxValue ? Math.max(value, maxValue) : value;
+  });
+  return maxValue;
+}
+
+function truthyTimingValue(val) {
+  return val === 0 || val != null;
+}
+
+function getCssTransitionDurationStyle(duration, applyOnlyDuration) {
+  var style = TRANSITION_PROP;
+  var value = duration + 's';
+  if (applyOnlyDuration) {
+    style += DURATION_KEY;
+  } else {
+    value += ' linear all';
+  }
+  return [style, value];
+}
+
+function createLocalCacheLookup() {
+  var cache = Object.create(null);
+  return {
+    flush: function() {
+      cache = Object.create(null);
+    },
+
+    count: function(key) {
+      var entry = cache[key];
+      return entry ? entry.total : 0;
+    },
+
+    get: function(key) {
+      var entry = cache[key];
+      return entry && entry.value;
+    },
+
+    put: function(key, value) {
+      if (!cache[key]) {
+        cache[key] = { total: 1, value: value };
+      } else {
+        cache[key].total++;
+      }
+    }
+  };
+}
+
+var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
+  var gcsLookup = createLocalCacheLookup();
+  var gcsStaggerLookup = createLocalCacheLookup();
+
+  this.$get = ['$window', '$$jqLite', '$$AnimateRunner', '$timeout', '$$forceReflow', '$sniffer', '$$rAF',
+       function($window,   $$jqLite,   $$AnimateRunner,   $timeout,   $$forceReflow,   $sniffer,   $$rAF) {
+
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+
+    var parentCounter = 0;
+    function gcsHashFn(node, extraClasses) {
+      var KEY = "$$ngAnimateParentKey";
+      var parentNode = node.parentNode;
+      var parentID = parentNode[KEY] || (parentNode[KEY] = ++parentCounter);
+      return parentID + '-' + node.getAttribute('class') + '-' + extraClasses;
+    }
+
+    function computeCachedCssStyles(node, className, cacheKey, properties) {
+      var timings = gcsLookup.get(cacheKey);
+
+      if (!timings) {
+        timings = computeCssStyles($window, node, properties);
+        if (timings.animationIterationCount === 'infinite') {
+          timings.animationIterationCount = 1;
+        }
+      }
+
+      // we keep putting this in multiple times even though the value and the cacheKey are the same
+      // because we're keeping an interal tally of how many duplicate animations are detected.
+      gcsLookup.put(cacheKey, timings);
+      return timings;
+    }
+
+    function computeCachedCssStaggerStyles(node, className, cacheKey, properties) {
+      var stagger;
+
+      // if we have one or more existing matches of matching elements
+      // containing the same parent + CSS styles (which is how cacheKey works)
+      // then staggering is possible
+      if (gcsLookup.count(cacheKey) > 0) {
+        stagger = gcsStaggerLookup.get(cacheKey);
+
+        if (!stagger) {
+          var staggerClassName = pendClasses(className, '-stagger');
+
+          $$jqLite.addClass(node, staggerClassName);
+
+          stagger = computeCssStyles($window, node, properties);
+
+          // force the conversion of a null value to zero incase not set
+          stagger.animationDuration = Math.max(stagger.animationDuration, 0);
+          stagger.transitionDuration = Math.max(stagger.transitionDuration, 0);
+
+          $$jqLite.removeClass(node, staggerClassName);
+
+          gcsStaggerLookup.put(cacheKey, stagger);
+        }
+      }
+
+      return stagger || {};
+    }
+
+    var cancelLastRAFRequest;
+    var rafWaitQueue = [];
+    function waitUntilQuiet(callback) {
+      if (cancelLastRAFRequest) {
+        cancelLastRAFRequest(); //cancels the request
+      }
+      rafWaitQueue.push(callback);
+      cancelLastRAFRequest = $$rAF(function() {
+        cancelLastRAFRequest = null;
+        gcsLookup.flush();
+        gcsStaggerLookup.flush();
+
+        // DO NOT REMOVE THIS LINE OR REFACTOR OUT THE `pageWidth` variable.
+        // PLEASE EXAMINE THE `$$forceReflow` service to understand why.
+        var pageWidth = $$forceReflow();
+
+        // we use a for loop to ensure that if the queue is changed
+        // during this looping then it will consider new requests
+        for (var i = 0; i < rafWaitQueue.length; i++) {
+          rafWaitQueue[i](pageWidth);
+        }
+        rafWaitQueue.length = 0;
+      });
+    }
+
+    return init;
+
+    function computeTimings(node, className, cacheKey) {
+      var timings = computeCachedCssStyles(node, className, cacheKey, DETECT_CSS_PROPERTIES);
+      var aD = timings.animationDelay;
+      var tD = timings.transitionDelay;
+      timings.maxDelay = aD && tD
+          ? Math.max(aD, tD)
+          : (aD || tD);
+      timings.maxDuration = Math.max(
+          timings.animationDuration * timings.animationIterationCount,
+          timings.transitionDuration);
+
+      return timings;
+    }
+
+    function init(element, options) {
+      var node = getDomNode(element);
+      if (!node || !node.parentNode) {
+        return closeAndReturnNoopAnimator();
+      }
+
+      options = prepareAnimationOptions(options);
+
+      var temporaryStyles = [];
+      var classes = element.attr('class');
+      var styles = packageStyles(options);
+      var animationClosed;
+      var animationPaused;
+      var animationCompleted;
+      var runner;
+      var runnerHost;
+      var maxDelay;
+      var maxDelayTime;
+      var maxDuration;
+      var maxDurationTime;
+
+      if (options.duration === 0 || (!$sniffer.animations && !$sniffer.transitions)) {
+        return closeAndReturnNoopAnimator();
+      }
+
+      var method = options.event && isArray(options.event)
+            ? options.event.join(' ')
+            : options.event;
+
+      var isStructural = method && options.structural;
+      var structuralClassName = '';
+      var addRemoveClassName = '';
+
+      if (isStructural) {
+        structuralClassName = pendClasses(method, EVENT_CLASS_PREFIX, true);
+      } else if (method) {
+        structuralClassName = method;
+      }
+
+      if (options.addClass) {
+        addRemoveClassName += pendClasses(options.addClass, ADD_CLASS_SUFFIX);
+      }
+
+      if (options.removeClass) {
+        if (addRemoveClassName.length) {
+          addRemoveClassName += ' ';
+        }
+        addRemoveClassName += pendClasses(options.removeClass, REMOVE_CLASS_SUFFIX);
+      }
+
+      // there may be a situation where a structural animation is combined together
+      // with CSS classes that need to resolve before the animation is computed.
+      // However this means that there is no explicit CSS code to block the animation
+      // from happening (by setting 0s none in the class name). If this is the case
+      // we need to apply the classes before the first rAF so we know to continue if
+      // there actually is a detected transition or keyframe animation
+      if (options.applyClassesEarly && addRemoveClassName.length) {
+        applyAnimationClasses(element, options);
+        addRemoveClassName = '';
+      }
+
+      var preparationClasses = [structuralClassName, addRemoveClassName].join(' ').trim();
+      var fullClassName = classes + ' ' + preparationClasses;
+      var activeClasses = pendClasses(preparationClasses, ACTIVE_CLASS_SUFFIX);
+      var hasToStyles = styles.to && Object.keys(styles.to).length > 0;
+      var containsKeyframeAnimation = (options.keyframeStyle || '').length > 0;
+
+      // there is no way we can trigger an animation if no styles and
+      // no classes are being applied which would then trigger a transition,
+      // unless there a is raw keyframe value that is applied to the element.
+      if (!containsKeyframeAnimation
+           && !hasToStyles
+           && !preparationClasses) {
+        return closeAndReturnNoopAnimator();
+      }
+
+      var cacheKey, stagger;
+      if (options.stagger > 0) {
+        var staggerVal = parseFloat(options.stagger);
+        stagger = {
+          transitionDelay: staggerVal,
+          animationDelay: staggerVal,
+          transitionDuration: 0,
+          animationDuration: 0
+        };
+      } else {
+        cacheKey = gcsHashFn(node, fullClassName);
+        stagger = computeCachedCssStaggerStyles(node, preparationClasses, cacheKey, DETECT_STAGGER_CSS_PROPERTIES);
+      }
+
+      if (!options.$$skipPreparationClasses) {
+        $$jqLite.addClass(element, preparationClasses);
+      }
+
+      var applyOnlyDuration;
+
+      if (options.transitionStyle) {
+        var transitionStyle = [TRANSITION_PROP, options.transitionStyle];
+        applyInlineStyle(node, transitionStyle);
+        temporaryStyles.push(transitionStyle);
+      }
+
+      if (options.duration >= 0) {
+        applyOnlyDuration = node.style[TRANSITION_PROP].length > 0;
+        var durationStyle = getCssTransitionDurationStyle(options.duration, applyOnlyDuration);
+
+        // we set the duration so that it will be picked up by getComputedStyle later
+        applyInlineStyle(node, durationStyle);
+        temporaryStyles.push(durationStyle);
+      }
+
+      if (options.keyframeStyle) {
+        var keyframeStyle = [ANIMATION_PROP, options.keyframeStyle];
+        applyInlineStyle(node, keyframeStyle);
+        temporaryStyles.push(keyframeStyle);
+      }
+
+      var itemIndex = stagger
+          ? options.staggerIndex >= 0
+              ? options.staggerIndex
+              : gcsLookup.count(cacheKey)
+          : 0;
+
+      var isFirst = itemIndex === 0;
+
+      // this is a pre-emptive way of forcing the setup classes to be added and applied INSTANTLY
+      // without causing any combination of transitions to kick in. By adding a negative delay value
+      // it forces the setup class' transition to end immediately. We later then remove the negative
+      // transition delay to allow for the transition to naturally do it's thing. The beauty here is
+      // that if there is no transition defined then nothing will happen and this will also allow
+      // other transitions to be stacked on top of each other without any chopping them out.
+      if (isFirst && !options.skipBlocking) {
+        blockTransitions(node, SAFE_FAST_FORWARD_DURATION_VALUE);
+      }
+
+      var timings = computeTimings(node, fullClassName, cacheKey);
+      var relativeDelay = timings.maxDelay;
+      maxDelay = Math.max(relativeDelay, 0);
+      maxDuration = timings.maxDuration;
+
+      var flags = {};
+      flags.hasTransitions          = timings.transitionDuration > 0;
+      flags.hasAnimations           = timings.animationDuration > 0;
+      flags.hasTransitionAll        = flags.hasTransitions && timings.transitionProperty == 'all';
+      flags.applyTransitionDuration = hasToStyles && (
+                                        (flags.hasTransitions && !flags.hasTransitionAll)
+                                         || (flags.hasAnimations && !flags.hasTransitions));
+      flags.applyAnimationDuration  = options.duration && flags.hasAnimations;
+      flags.applyTransitionDelay    = truthyTimingValue(options.delay) && (flags.applyTransitionDuration || flags.hasTransitions);
+      flags.applyAnimationDelay     = truthyTimingValue(options.delay) && flags.hasAnimations;
+      flags.recalculateTimingStyles = addRemoveClassName.length > 0;
+
+      if (flags.applyTransitionDuration || flags.applyAnimationDuration) {
+        maxDuration = options.duration ? parseFloat(options.duration) : maxDuration;
+
+        if (flags.applyTransitionDuration) {
+          flags.hasTransitions = true;
+          timings.transitionDuration = maxDuration;
+          applyOnlyDuration = node.style[TRANSITION_PROP + PROPERTY_KEY].length > 0;
+          temporaryStyles.push(getCssTransitionDurationStyle(maxDuration, applyOnlyDuration));
+        }
+
+        if (flags.applyAnimationDuration) {
+          flags.hasAnimations = true;
+          timings.animationDuration = maxDuration;
+          temporaryStyles.push(getCssKeyframeDurationStyle(maxDuration));
+        }
+      }
+
+      if (maxDuration === 0 && !flags.recalculateTimingStyles) {
+        return closeAndReturnNoopAnimator();
+      }
+
+      // we need to recalculate the delay value since we used a pre-emptive negative
+      // delay value and the delay value is required for the final event checking. This
+      // property will ensure that this will happen after the RAF phase has passed.
+      if (options.duration == null && timings.transitionDuration > 0) {
+        flags.recalculateTimingStyles = flags.recalculateTimingStyles || isFirst;
+      }
+
+      maxDelayTime = maxDelay * ONE_SECOND;
+      maxDurationTime = maxDuration * ONE_SECOND;
+      if (!options.skipBlocking) {
+        flags.blockTransition = timings.transitionDuration > 0;
+        flags.blockKeyframeAnimation = timings.animationDuration > 0 &&
+                                       stagger.animationDelay > 0 &&
+                                       stagger.animationDuration === 0;
+      }
+
+      applyAnimationFromStyles(element, options);
+
+      if (flags.blockTransition || flags.blockKeyframeAnimation) {
+        applyBlocking(maxDuration);
+      } else if (!options.skipBlocking) {
+        blockTransitions(node, false);
+      }
+
+      // TODO(matsko): for 1.5 change this code to have an animator object for better debugging
+      return {
+        $$willAnimate: true,
+        end: endFn,
+        start: function() {
+          if (animationClosed) return;
+
+          runnerHost = {
+            end: endFn,
+            cancel: cancelFn,
+            resume: null, //this will be set during the start() phase
+            pause: null
+          };
+
+          runner = new $$AnimateRunner(runnerHost);
+
+          waitUntilQuiet(start);
+
+          // we don't have access to pause/resume the animation
+          // since it hasn't run yet. AnimateRunner will therefore
+          // set noop functions for resume and pause and they will
+          // later be overridden once the animation is triggered
+          return runner;
+        }
+      };
+
+      function endFn() {
+        close();
+      }
+
+      function cancelFn() {
+        close(true);
+      }
+
+      function close(rejected) { // jshint ignore:line
+        // if the promise has been called already then we shouldn't close
+        // the animation again
+        if (animationClosed || (animationCompleted && animationPaused)) return;
+        animationClosed = true;
+        animationPaused = false;
+
+        if (!options.$$skipPreparationClasses) {
+          $$jqLite.removeClass(element, preparationClasses);
+        }
+        $$jqLite.removeClass(element, activeClasses);
+
+        blockKeyframeAnimations(node, false);
+        blockTransitions(node, false);
+
+        forEach(temporaryStyles, function(entry) {
+          // There is only one way to remove inline style properties entirely from elements.
+          // By using `removeProperty` this works, but we need to convert camel-cased CSS
+          // styles down to hyphenated values.
+          node.style[entry[0]] = '';
+        });
+
+        applyAnimationClasses(element, options);
+        applyAnimationStyles(element, options);
+
+        // the reason why we have this option is to allow a synchronous closing callback
+        // that is fired as SOON as the animation ends (when the CSS is removed) or if
+        // the animation never takes off at all. A good example is a leave animation since
+        // the element must be removed just after the animation is over or else the element
+        // will appear on screen for one animation frame causing an overbearing flicker.
+        if (options.onDone) {
+          options.onDone();
+        }
+
+        // if the preparation function fails then the promise is not setup
+        if (runner) {
+          runner.complete(!rejected);
+        }
+      }
+
+      function applyBlocking(duration) {
+        if (flags.blockTransition) {
+          blockTransitions(node, duration);
+        }
+
+        if (flags.blockKeyframeAnimation) {
+          blockKeyframeAnimations(node, !!duration);
+        }
+      }
+
+      function closeAndReturnNoopAnimator() {
+        runner = new $$AnimateRunner({
+          end: endFn,
+          cancel: cancelFn
+        });
+
+        close();
+
+        return {
+          $$willAnimate: false,
+          start: function() {
+            return runner;
+          },
+          end: endFn
+        };
+      }
+
+      function start() {
+        if (animationClosed) return;
+        if (!node.parentNode) {
+          close();
+          return;
+        }
+
+        var startTime, events = [];
+
+        // even though we only pause keyframe animations here the pause flag
+        // will still happen when transitions are used. Only the transition will
+        // not be paused since that is not possible. If the animation ends when
+        // paused then it will not complete until unpaused or cancelled.
+        var playPause = function(playAnimation) {
+          if (!animationCompleted) {
+            animationPaused = !playAnimation;
+            if (timings.animationDuration) {
+              var value = blockKeyframeAnimations(node, animationPaused);
+              animationPaused
+                  ? temporaryStyles.push(value)
+                  : removeFromArray(temporaryStyles, value);
+            }
+          } else if (animationPaused && playAnimation) {
+            animationPaused = false;
+            close();
+          }
+        };
+
+        // checking the stagger duration prevents an accidently cascade of the CSS delay style
+        // being inherited from the parent. If the transition duration is zero then we can safely
+        // rely that the delay value is an intential stagger delay style.
+        var maxStagger = itemIndex > 0
+                         && ((timings.transitionDuration && stagger.transitionDuration === 0) ||
+                            (timings.animationDuration && stagger.animationDuration === 0))
+                         && Math.max(stagger.animationDelay, stagger.transitionDelay);
+        if (maxStagger) {
+          $timeout(triggerAnimationStart,
+                   Math.floor(maxStagger * itemIndex * ONE_SECOND),
+                   false);
+        } else {
+          triggerAnimationStart();
+        }
+
+        // this will decorate the existing promise runner with pause/resume methods
+        runnerHost.resume = function() {
+          playPause(true);
+        };
+
+        runnerHost.pause = function() {
+          playPause(false);
+        };
+
+        function triggerAnimationStart() {
+          // just incase a stagger animation kicks in when the animation
+          // itself was cancelled entirely
+          if (animationClosed) return;
+
+          applyBlocking(false);
+
+          forEach(temporaryStyles, function(entry) {
+            var key = entry[0];
+            var value = entry[1];
+            node.style[key] = value;
+          });
+
+          applyAnimationClasses(element, options);
+          $$jqLite.addClass(element, activeClasses);
+
+          if (flags.recalculateTimingStyles) {
+            fullClassName = node.className + ' ' + preparationClasses;
+            cacheKey = gcsHashFn(node, fullClassName);
+
+            timings = computeTimings(node, fullClassName, cacheKey);
+            relativeDelay = timings.maxDelay;
+            maxDelay = Math.max(relativeDelay, 0);
+            maxDuration = timings.maxDuration;
+
+            if (maxDuration === 0) {
+              close();
+              return;
+            }
+
+            flags.hasTransitions = timings.transitionDuration > 0;
+            flags.hasAnimations = timings.animationDuration > 0;
+          }
+
+          if (flags.applyTransitionDelay || flags.applyAnimationDelay) {
+            relativeDelay = typeof options.delay !== "boolean" && truthyTimingValue(options.delay)
+                  ? parseFloat(options.delay)
+                  : relativeDelay;
+
+            maxDelay = Math.max(relativeDelay, 0);
+
+            var delayStyle;
+            if (flags.applyTransitionDelay) {
+              timings.transitionDelay = relativeDelay;
+              delayStyle = getCssDelayStyle(relativeDelay);
+              temporaryStyles.push(delayStyle);
+              node.style[delayStyle[0]] = delayStyle[1];
+            }
+
+            if (flags.applyAnimationDelay) {
+              timings.animationDelay = relativeDelay;
+              delayStyle = getCssDelayStyle(relativeDelay, true);
+              temporaryStyles.push(delayStyle);
+              node.style[delayStyle[0]] = delayStyle[1];
+            }
+          }
+
+          maxDelayTime = maxDelay * ONE_SECOND;
+          maxDurationTime = maxDuration * ONE_SECOND;
+
+          if (options.easing) {
+            var easeProp, easeVal = options.easing;
+            if (flags.hasTransitions) {
+              easeProp = TRANSITION_PROP + TIMING_KEY;
+              temporaryStyles.push([easeProp, easeVal]);
+              node.style[easeProp] = easeVal;
+            }
+            if (flags.hasAnimations) {
+              easeProp = ANIMATION_PROP + TIMING_KEY;
+              temporaryStyles.push([easeProp, easeVal]);
+              node.style[easeProp] = easeVal;
+            }
+          }
+
+          if (timings.transitionDuration) {
+            events.push(TRANSITIONEND_EVENT);
+          }
+
+          if (timings.animationDuration) {
+            events.push(ANIMATIONEND_EVENT);
+          }
+
+          startTime = Date.now();
+          element.on(events.join(' '), onAnimationProgress);
+          $timeout(onAnimationExpired, maxDelayTime + CLOSING_TIME_BUFFER * maxDurationTime, false);
+
+          applyAnimationToStyles(element, options);
+        }
+
+        function onAnimationExpired() {
+          // although an expired animation is a failed animation, getting to
+          // this outcome is very easy if the CSS code screws up. Therefore we
+          // should still continue normally as if the animation completed correctly.
+          close();
+        }
+
+        function onAnimationProgress(event) {
+          event.stopPropagation();
+          var ev = event.originalEvent || event;
+          var timeStamp = ev.$manualTimeStamp || ev.timeStamp || Date.now();
+
+          /* Firefox (or possibly just Gecko) likes to not round values up
+           * when a ms measurement is used for the animation */
+          var elapsedTime = parseFloat(ev.elapsedTime.toFixed(ELAPSED_TIME_MAX_DECIMAL_PLACES));
+
+          /* $manualTimeStamp is a mocked timeStamp value which is set
+           * within browserTrigger(). This is only here so that tests can
+           * mock animations properly. Real events fallback to event.timeStamp,
+           * or, if they don't, then a timeStamp is automatically created for them.
+           * We're checking to see if the timeStamp surpasses the expected delay,
+           * but we're using elapsedTime instead of the timeStamp on the 2nd
+           * pre-condition since animations sometimes close off early */
+          if (Math.max(timeStamp - startTime, 0) >= maxDelayTime && elapsedTime >= maxDuration) {
+            // we set this flag to ensure that if the transition is paused then, when resumed,
+            // the animation will automatically close itself since transitions cannot be paused.
+            animationCompleted = true;
+            close();
+          }
+        }
+      }
+    }
+  }];
+}];
diff --git a/src/ngAnimate/animateCssDriver.js b/src/ngAnimate/animateCssDriver.js
new file mode 100644
index 000000000000..c47a27a85c23
--- /dev/null
+++ b/src/ngAnimate/animateCssDriver.js
@@ -0,0 +1,272 @@
+'use strict';
+
+var $$AnimateCssDriverProvider = ['$$animationProvider', function($$animationProvider) {
+  $$animationProvider.drivers.push('$$animateCssDriver');
+
+  var NG_ANIMATE_SHIM_CLASS_NAME = 'ng-animate-shim';
+  var NG_ANIMATE_ANCHOR_CLASS_NAME = 'ng-anchor';
+
+  var NG_OUT_ANCHOR_CLASS_NAME = 'ng-anchor-out';
+  var NG_IN_ANCHOR_CLASS_NAME = 'ng-anchor-in';
+
+  this.$get = ['$animateCss', '$rootScope', '$$AnimateRunner', '$rootElement', '$$body', '$sniffer', '$$jqLite',
+       function($animateCss,   $rootScope,   $$AnimateRunner,   $rootElement,   $$body,   $sniffer,   $$jqLite) {
+
+    // only browsers that support these properties can render animations
+    if (!$sniffer.animations && !$sniffer.transitions) return noop;
+
+    var bodyNode = getDomNode($$body);
+    var rootNode = getDomNode($rootElement);
+
+    var rootBodyElement = jqLite(bodyNode.parentNode === rootNode ? bodyNode : rootNode);
+
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+
+    return function initDriverFn(animationDetails, onBeforeClassesAppliedCb) {
+      return animationDetails.from && animationDetails.to
+          ? prepareFromToAnchorAnimation(animationDetails.from,
+                                         animationDetails.to,
+                                         animationDetails.classes,
+                                         animationDetails.anchors)
+          : prepareRegularAnimation(animationDetails, onBeforeClassesAppliedCb);
+    };
+
+    function filterCssClasses(classes) {
+      //remove all the `ng-` stuff
+      return classes.replace(/\bng-\S+\b/g, '');
+    }
+
+    function getUniqueValues(a, b) {
+      if (isString(a)) a = a.split(' ');
+      if (isString(b)) b = b.split(' ');
+      return a.filter(function(val) {
+        return b.indexOf(val) === -1;
+      }).join(' ');
+    }
+
+    function prepareAnchoredAnimation(classes, outAnchor, inAnchor) {
+      var clone = jqLite(getDomNode(outAnchor).cloneNode(true));
+      var startingClasses = filterCssClasses(getClassVal(clone));
+
+      outAnchor.addClass(NG_ANIMATE_SHIM_CLASS_NAME);
+      inAnchor.addClass(NG_ANIMATE_SHIM_CLASS_NAME);
+
+      clone.addClass(NG_ANIMATE_ANCHOR_CLASS_NAME);
+
+      rootBodyElement.append(clone);
+
+      var animatorIn, animatorOut = prepareOutAnimation();
+
+      // the user may not end up using the `out` animation and
+      // only making use of the `in` animation or vice-versa.
+      // In either case we should allow this and not assume the
+      // animation is over unless both animations are not used.
+      if (!animatorOut) {
+        animatorIn = prepareInAnimation();
+        if (!animatorIn) {
+          return end();
+        }
+      }
+
+      var startingAnimator = animatorOut || animatorIn;
+
+      return {
+        start: function() {
+          var runner;
+
+          var currentAnimation = startingAnimator.start();
+          currentAnimation.done(function() {
+            currentAnimation = null;
+            if (!animatorIn) {
+              animatorIn = prepareInAnimation();
+              if (animatorIn) {
+                currentAnimation = animatorIn.start();
+                currentAnimation.done(function() {
+                  currentAnimation = null;
+                  end();
+                  runner.complete();
+                });
+                return currentAnimation;
+              }
+            }
+            // in the event that there is no `in` animation
+            end();
+            runner.complete();
+          });
+
+          runner = new $$AnimateRunner({
+            end: endFn,
+            cancel: endFn
+          });
+
+          return runner;
+
+          function endFn() {
+            if (currentAnimation) {
+              currentAnimation.end();
+            }
+          }
+        }
+      };
+
+      function calculateAnchorStyles(anchor) {
+        var styles = {};
+
+        var coords = getDomNode(anchor).getBoundingClientRect();
+
+        // we iterate directly since safari messes up and doesn't return
+        // all the keys for the coods object when iterated
+        forEach(['width','height','top','left'], function(key) {
+          var value = coords[key];
+          switch (key) {
+            case 'top':
+              value += bodyNode.scrollTop;
+              break;
+            case 'left':
+              value += bodyNode.scrollLeft;
+              break;
+          }
+          styles[key] = Math.floor(value) + 'px';
+        });
+        return styles;
+      }
+
+      function prepareOutAnimation() {
+        var animator = $animateCss(clone, {
+          addClass: NG_OUT_ANCHOR_CLASS_NAME,
+          delay: true,
+          from: calculateAnchorStyles(outAnchor)
+        });
+
+        // read the comment within `prepareRegularAnimation` to understand
+        // why this check is necessary
+        return animator.$$willAnimate ? animator : null;
+      }
+
+      function getClassVal(element) {
+        return element.attr('class') || '';
+      }
+
+      function prepareInAnimation() {
+        var endingClasses = filterCssClasses(getClassVal(inAnchor));
+        var toAdd = getUniqueValues(endingClasses, startingClasses);
+        var toRemove = getUniqueValues(startingClasses, endingClasses);
+
+        var animator = $animateCss(clone, {
+          to: calculateAnchorStyles(inAnchor),
+          addClass: NG_IN_ANCHOR_CLASS_NAME + ' ' + toAdd,
+          removeClass: NG_OUT_ANCHOR_CLASS_NAME + ' ' + toRemove,
+          delay: true
+        });
+
+        // read the comment within `prepareRegularAnimation` to understand
+        // why this check is necessary
+        return animator.$$willAnimate ? animator : null;
+      }
+
+      function end() {
+        clone.remove();
+        outAnchor.removeClass(NG_ANIMATE_SHIM_CLASS_NAME);
+        inAnchor.removeClass(NG_ANIMATE_SHIM_CLASS_NAME);
+      }
+    }
+
+    function prepareFromToAnchorAnimation(from, to, classes, anchors) {
+      var fromAnimation = prepareRegularAnimation(from, noop);
+      var toAnimation = prepareRegularAnimation(to, noop);
+
+      var anchorAnimations = [];
+      forEach(anchors, function(anchor) {
+        var outElement = anchor['out'];
+        var inElement = anchor['in'];
+        var animator = prepareAnchoredAnimation(classes, outElement, inElement);
+        if (animator) {
+          anchorAnimations.push(animator);
+        }
+      });
+
+      // no point in doing anything when there are no elements to animate
+      if (!fromAnimation && !toAnimation && anchorAnimations.length === 0) return;
+
+      return {
+        start: function() {
+          var animationRunners = [];
+
+          if (fromAnimation) {
+            animationRunners.push(fromAnimation.start());
+          }
+
+          if (toAnimation) {
+            animationRunners.push(toAnimation.start());
+          }
+
+          forEach(anchorAnimations, function(animation) {
+            animationRunners.push(animation.start());
+          });
+
+          var runner = new $$AnimateRunner({
+            end: endFn,
+            cancel: endFn // CSS-driven animations cannot be cancelled, only ended
+          });
+
+          $$AnimateRunner.all(animationRunners, function(status) {
+            runner.complete(status);
+          });
+
+          return runner;
+
+          function endFn() {
+            forEach(animationRunners, function(runner) {
+              runner.end();
+            });
+          }
+        }
+      };
+    }
+
+    function prepareRegularAnimation(animationDetails, onBeforeClassesAppliedCb) {
+      var element = animationDetails.element;
+      var options = animationDetails.options || {};
+
+      // since the ng-EVENT, class-ADD and class-REMOVE classes are applied inside
+      // of the animateQueue pre and postDigest stages then there is no need to add
+      // then them here as well.
+      options.$$skipPreparationClasses = true;
+
+      // during the pre/post digest stages inside of animateQueue we also performed
+      // the blocking (transition:-9999s) so there is no point in doing that again.
+      options.skipBlocking = true;
+
+      if (animationDetails.structural) {
+        options.event = animationDetails.event;
+
+        // we special case the leave animation since we want to ensure that
+        // the element is removed as soon as the animation is over. Otherwise
+        // a flicker might appear or the element may not be removed at all
+        if (animationDetails.event === 'leave') {
+          options.onDone = options.domOperation;
+        }
+      }
+
+      // we apply the classes right away since the pre-digest took care of the
+      // preparation classes.
+      onBeforeClassesAppliedCb(element);
+      applyAnimationClasses(element, options);
+
+      // We assign the preparationClasses as the actual animation event since
+      // the internals of $animateCss will just suffix the event token values
+      // with `-active` to trigger the animation.
+      if (options.preparationClasses) {
+        options.event = concatWithSpace(options.event, options.preparationClasses);
+      }
+
+      var animator = $animateCss(element, options);
+
+      // the driver lookup code inside of $$animation attempts to spawn a
+      // driver one by one until a driver returns a.$$willAnimate animator object.
+      // $animateCss will always return an object, however, it will pass in
+      // a flag as a hint as to whether an animation was detected or not
+      return animator.$$willAnimate ? animator : null;
+    }
+  }];
+}];
diff --git a/src/ngAnimate/animateJs.js b/src/ngAnimate/animateJs.js
new file mode 100644
index 000000000000..9f38bf14bd92
--- /dev/null
+++ b/src/ngAnimate/animateJs.js
@@ -0,0 +1,261 @@
+'use strict';
+
+// TODO(matsko): use caching here to speed things up for detection
+// TODO(matsko): add documentation
+//  by the time...
+
+var $$AnimateJsProvider = ['$animateProvider', function($animateProvider) {
+  this.$get = ['$injector', '$$AnimateRunner', '$$rAFMutex', '$$jqLite',
+       function($injector,   $$AnimateRunner,   $$rAFMutex,   $$jqLite) {
+
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+         // $animateJs(element, 'enter');
+    return function(element, event, classes, options) {
+      // the `classes` argument is optional and if it is not used
+      // then the classes will be resolved from the element's className
+      // property as well as options.addClass/options.removeClass.
+      if (arguments.length === 3 && isObject(classes)) {
+        options = classes;
+        classes = null;
+      }
+
+      options = prepareAnimationOptions(options);
+      if (!classes) {
+        classes = element.attr('class') || '';
+        if (options.addClass) {
+          classes += ' ' + options.addClass;
+        }
+        if (options.removeClass) {
+          classes += ' ' + options.removeClass;
+        }
+      }
+
+      var classesToAdd = options.addClass;
+      var classesToRemove = options.removeClass;
+
+      // the lookupAnimations function returns a series of animation objects that are
+      // matched up with one or more of the CSS classes. These animation objects are
+      // defined via the module.animation factory function. If nothing is detected then
+      // we don't return anything which then makes $animation query the next driver.
+      var animations = lookupAnimations(classes);
+      var before, after;
+      if (animations.length) {
+        var afterFn, beforeFn;
+        if (event == 'leave') {
+          beforeFn = 'leave';
+          afterFn = 'afterLeave'; // TODO(matsko): get rid of this
+        } else {
+          beforeFn = 'before' + event.charAt(0).toUpperCase() + event.substr(1);
+          afterFn = event;
+        }
+
+        if (event !== 'enter' && event !== 'move') {
+          before = packageAnimations(element, event, options, animations, beforeFn);
+        }
+        after  = packageAnimations(element, event, options, animations, afterFn);
+      }
+
+      // no matching animations
+      if (!before && !after) return;
+
+      function applyOptions() {
+        options.domOperation();
+        applyAnimationClasses(element, options);
+      }
+
+      return {
+        start: function() {
+          var closeActiveAnimations;
+          var chain = [];
+
+          if (before) {
+            chain.push(function(fn) {
+              closeActiveAnimations = before(fn);
+            });
+          }
+
+          if (chain.length) {
+            chain.push(function(fn) {
+              applyOptions();
+              fn(true);
+            });
+          } else {
+            applyOptions();
+          }
+
+          if (after) {
+            chain.push(function(fn) {
+              closeActiveAnimations = after(fn);
+            });
+          }
+
+          var animationClosed = false;
+          var runner = new $$AnimateRunner({
+            end: function() {
+              endAnimations();
+            },
+            cancel: function() {
+              endAnimations(true);
+            }
+          });
+
+          $$AnimateRunner.chain(chain, onComplete);
+          return runner;
+
+          function onComplete(success) {
+            animationClosed = true;
+            applyOptions();
+            applyAnimationStyles(element, options);
+            runner.complete(success);
+          }
+
+          function endAnimations(cancelled) {
+            if (!animationClosed) {
+              (closeActiveAnimations || noop)(cancelled);
+              onComplete(cancelled);
+            }
+          }
+        }
+      };
+
+      function executeAnimationFn(fn, element, event, options, onDone) {
+        var args;
+        switch (event) {
+          case 'animate':
+            args = [element, options.from, options.to, onDone];
+            break;
+
+          case 'setClass':
+            args = [element, classesToAdd, classesToRemove, onDone];
+            break;
+
+          case 'addClass':
+            args = [element, classesToAdd, onDone];
+            break;
+
+          case 'removeClass':
+            args = [element, classesToRemove, onDone];
+            break;
+
+          default:
+            args = [element, onDone];
+            break;
+        }
+
+        args.push(options);
+
+        var value = fn.apply(fn, args);
+        if (value) {
+          if (isFunction(value.start)) {
+            value = value.start();
+          }
+
+          if (value instanceof $$AnimateRunner) {
+            value.done(onDone);
+          } else if (isFunction(value)) {
+            // optional onEnd / onCancel callback
+            return value;
+          }
+        }
+
+        return noop;
+      }
+
+      function groupEventedAnimations(element, event, options, animations, fnName) {
+        var operations = [];
+        forEach(animations, function(ani) {
+          var animation = ani[fnName];
+          if (!animation) return;
+
+          // note that all of these animations will run in parallel
+          operations.push(function() {
+            var runner;
+            var endProgressCb;
+
+            var resolved = false;
+            var onAnimationComplete = function(rejected) {
+              if (!resolved) {
+                resolved = true;
+                (endProgressCb || noop)(rejected);
+                runner.complete(!rejected);
+              }
+            };
+
+            runner = new $$AnimateRunner({
+              end: function() {
+                onAnimationComplete();
+              },
+              cancel: function() {
+                onAnimationComplete(true);
+              }
+            });
+
+            endProgressCb = executeAnimationFn(animation, element, event, options, function(result) {
+              var cancelled = result === false;
+              onAnimationComplete(cancelled);
+            });
+
+            return runner;
+          });
+        });
+
+        return operations;
+      }
+
+      function packageAnimations(element, event, options, animations, fnName) {
+        var operations = groupEventedAnimations(element, event, options, animations, fnName);
+        if (operations.length === 0) {
+          var a,b;
+          if (fnName === 'beforeSetClass') {
+            a = groupEventedAnimations(element, 'removeClass', options, animations, 'beforeRemoveClass');
+            b = groupEventedAnimations(element, 'addClass', options, animations, 'beforeAddClass');
+          } else if (fnName === 'setClass') {
+            a = groupEventedAnimations(element, 'removeClass', options, animations, 'removeClass');
+            b = groupEventedAnimations(element, 'addClass', options, animations, 'addClass');
+          }
+
+          if (a) {
+            operations = operations.concat(a);
+          }
+          if (b) {
+            operations = operations.concat(b);
+          }
+        }
+
+        if (operations.length === 0) return;
+
+        // TODO(matsko): add documentation
+        return function startAnimation(callback) {
+          var runners = [];
+          if (operations.length) {
+            forEach(operations, function(animateFn) {
+              runners.push(animateFn());
+            });
+          }
+
+          runners.length ? $$AnimateRunner.all(runners, callback) : callback();
+
+          return function endFn(reject) {
+            forEach(runners, function(runner) {
+              reject ? runner.cancel() : runner.end();
+            });
+          };
+        };
+      }
+    };
+
+    function lookupAnimations(classes) {
+      classes = isArray(classes) ? classes : classes.split(' ');
+      var matches = [], flagMap = {};
+      for (var i=0; i < classes.length; i++) {
+        var klass = classes[i],
+            animationFactory = $animateProvider.$$registeredAnimations[klass];
+        if (animationFactory && !flagMap[klass]) {
+          matches.push($injector.get(animationFactory));
+          flagMap[klass] = true;
+        }
+      }
+      return matches;
+    }
+  }];
+}];
diff --git a/src/ngAnimate/animateJsDriver.js b/src/ngAnimate/animateJsDriver.js
new file mode 100644
index 000000000000..bba970456872
--- /dev/null
+++ b/src/ngAnimate/animateJsDriver.js
@@ -0,0 +1,61 @@
+'use strict';
+
+var $$AnimateJsDriverProvider = ['$$animationProvider', function($$animationProvider) {
+  $$animationProvider.drivers.push('$$animateJsDriver');
+  this.$get = ['$$animateJs', '$$AnimateRunner', function($$animateJs, $$AnimateRunner) {
+    return function initDriverFn(animationDetails) {
+      if (animationDetails.from && animationDetails.to) {
+        var fromAnimation = prepareAnimation(animationDetails.from);
+        var toAnimation = prepareAnimation(animationDetails.to);
+        if (!fromAnimation && !toAnimation) return;
+
+        return {
+          start: function() {
+            var animationRunners = [];
+
+            if (fromAnimation) {
+              animationRunners.push(fromAnimation.start());
+            }
+
+            if (toAnimation) {
+              animationRunners.push(toAnimation.start());
+            }
+
+            $$AnimateRunner.all(animationRunners, done);
+
+            var runner = new $$AnimateRunner({
+              end: endFnFactory(),
+              cancel: endFnFactory()
+            });
+
+            return runner;
+
+            function endFnFactory() {
+              return function() {
+                forEach(animationRunners, function(runner) {
+                  // at this point we cannot cancel animations for groups just yet. 1.5+
+                  runner.end();
+                });
+              };
+            }
+
+            function done(status) {
+              runner.complete(status);
+            }
+          }
+        };
+      } else {
+        return prepareAnimation(animationDetails);
+      }
+    };
+
+    function prepareAnimation(animationDetails) {
+      // TODO(matsko): make sure to check for grouped animations and delegate down to normal animations
+      var element = animationDetails.element;
+      var event = animationDetails.event;
+      var options = animationDetails.options;
+      var classes = animationDetails.classes;
+      return $$animateJs(element, event, classes, options);
+    }
+  }];
+}];
diff --git a/src/ngAnimate/animateQueue.js b/src/ngAnimate/animateQueue.js
new file mode 100644
index 000000000000..dc1c7536d51d
--- /dev/null
+++ b/src/ngAnimate/animateQueue.js
@@ -0,0 +1,590 @@
+'use strict';
+
+var NG_ANIMATE_ATTR_NAME = 'data-ng-animate';
+var NG_ANIMATE_PIN_DATA = '$ngAnimatePin';
+var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
+  var PRE_DIGEST_STATE = 1;
+  var RUNNING_STATE = 2;
+
+  var rules = this.rules = {
+    skip: [],
+    cancel: [],
+    join: []
+  };
+
+  function isAllowed(ruleType, element, currentAnimation, previousAnimation) {
+    return rules[ruleType].some(function(fn) {
+      return fn(element, currentAnimation, previousAnimation);
+    });
+  }
+
+  function hasAnimationClasses(options, and) {
+    options = options || {};
+    var a = (options.addClass || '').length > 0;
+    var b = (options.removeClass || '').length > 0;
+    return and ? a && b : a || b;
+  }
+
+  rules.join.push(function(element, newAnimation, currentAnimation) {
+    // if the new animation is class-based then we can just tack that on
+    return !newAnimation.structural && hasAnimationClasses(newAnimation.options);
+  });
+
+  rules.skip.push(function(element, newAnimation, currentAnimation) {
+    // there is no need to animate anything if no classes are being added and
+    // there is no structural animation that will be triggered
+    return !newAnimation.structural && !hasAnimationClasses(newAnimation.options);
+  });
+
+  rules.skip.push(function(element, newAnimation, currentAnimation) {
+    // why should we trigger a new structural animation if the element will
+    // be removed from the DOM anyway?
+    return currentAnimation.event == 'leave' && newAnimation.structural;
+  });
+
+  rules.skip.push(function(element, newAnimation, currentAnimation) {
+    // if there is an ongoing current animation then don't even bother running the class-based animation
+    return currentAnimation.structural && currentAnimation.state === RUNNING_STATE && !newAnimation.structural;
+  });
+
+  rules.cancel.push(function(element, newAnimation, currentAnimation) {
+    // there can never be two structural animations running at the same time
+    return currentAnimation.structural && newAnimation.structural;
+  });
+
+  rules.cancel.push(function(element, newAnimation, currentAnimation) {
+    // if the previous animation is already running, but the new animation will
+    // be triggered, but the new animation is structural
+    return currentAnimation.state === RUNNING_STATE && newAnimation.structural;
+  });
+
+  rules.cancel.push(function(element, newAnimation, currentAnimation) {
+    var nO = newAnimation.options;
+    var cO = currentAnimation.options;
+
+    // if the exact same CSS class is added/removed then it's safe to cancel it
+    return (nO.addClass && nO.addClass === cO.removeClass) || (nO.removeClass && nO.removeClass === cO.addClass);
+  });
+
+  this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$body', '$$HashMap',
+               '$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite',
+       function($$rAF,   $rootScope,   $rootElement,   $document,   $$body,   $$HashMap,
+                $$animation,   $$AnimateRunner,   $templateRequest,   $$jqLite) {
+
+    var activeAnimationsLookup = new $$HashMap();
+    var disabledElementsLookup = new $$HashMap();
+    var animationsEnabled = null;
+
+    // Wait until all directive and route-related templates are downloaded and
+    // compiled. The $templateRequest.totalPendingRequests variable keeps track of
+    // all of the remote templates being currently downloaded. If there are no
+    // templates currently downloading then the watcher will still fire anyway.
+    var deregisterWatch = $rootScope.$watch(
+      function() { return $templateRequest.totalPendingRequests === 0; },
+      function(isEmpty) {
+        if (!isEmpty) return;
+        deregisterWatch();
+
+        // Now that all templates have been downloaded, $animate will wait until
+        // the post digest queue is empty before enabling animations. By having two
+        // calls to $postDigest calls we can ensure that the flag is enabled at the
+        // very end of the post digest queue. Since all of the animations in $animate
+        // use $postDigest, it's important that the code below executes at the end.
+        // This basically means that the page is fully downloaded and compiled before
+        // any animations are triggered.
+        $rootScope.$$postDigest(function() {
+          $rootScope.$$postDigest(function() {
+            // we check for null directly in the event that the application already called
+            // .enabled() with whatever arguments that it provided it with
+            if (animationsEnabled === null) {
+              animationsEnabled = true;
+            }
+          });
+        });
+      }
+    );
+
+    var callbackRegistry = {};
+
+    // remember that the classNameFilter is set during the provider/config
+    // stage therefore we can optimize here and setup a helper function
+    var classNameFilter = $animateProvider.classNameFilter();
+    var isAnimatableClassName = !classNameFilter
+              ? function() { return true; }
+              : function(className) {
+                return classNameFilter.test(className);
+              };
+
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+
+    function normalizeAnimationOptions(element, options) {
+      return mergeAnimationOptions(element, options, {});
+    }
+
+    function findCallbacks(element, event) {
+      var targetNode = getDomNode(element);
+
+      var matches = [];
+      var entries = callbackRegistry[event];
+      if (entries) {
+        forEach(entries, function(entry) {
+          if (entry.node.contains(targetNode)) {
+            matches.push(entry.callback);
+          }
+        });
+      }
+
+      return matches;
+    }
+
+    function triggerCallback(event, element, phase, data) {
+      $$rAF(function() {
+        forEach(findCallbacks(element, event), function(callback) {
+          callback(element, phase, data);
+        });
+      });
+    }
+
+    return {
+      on: function(event, container, callback) {
+        var node = extractElementNode(container);
+        callbackRegistry[event] = callbackRegistry[event] || [];
+        callbackRegistry[event].push({
+          node: node,
+          callback: callback
+        });
+      },
+
+      off: function(event, container, callback) {
+        var entries = callbackRegistry[event];
+        if (!entries) return;
+
+        callbackRegistry[event] = arguments.length === 1
+            ? null
+            : filterFromRegistry(entries, container, callback);
+
+        function filterFromRegistry(list, matchContainer, matchCallback) {
+          var containerNode = extractElementNode(matchContainer);
+          return list.filter(function(entry) {
+            var isMatch = entry.node === containerNode &&
+                            (!matchCallback || entry.callback === matchCallback);
+            return !isMatch;
+          });
+        }
+      },
+
+      pin: function(element, parentElement) {
+        assertArg(isElement(element), 'element', 'not an element');
+        assertArg(isElement(parentElement), 'parentElement', 'not an element');
+        element.data(NG_ANIMATE_PIN_DATA, parentElement);
+      },
+
+      push: function(element, event, options, domOperation) {
+        options = options || {};
+        options.domOperation = domOperation;
+        return queueAnimation(element, event, options);
+      },
+
+      // this method has four signatures:
+      //  () - global getter
+      //  (bool) - global setter
+      //  (element) - element getter
+      //  (element, bool) - element setter<F37>
+      enabled: function(element, bool) {
+        var argCount = arguments.length;
+
+        if (argCount === 0) {
+          // () - Global getter
+          bool = !!animationsEnabled;
+        } else {
+          var hasElement = isElement(element);
+
+          if (!hasElement) {
+            // (bool) - Global setter
+            bool = animationsEnabled = !!element;
+          } else {
+            var node = getDomNode(element);
+            var recordExists = disabledElementsLookup.get(node);
+
+            if (argCount === 1) {
+              // (element) - Element getter
+              bool = !recordExists;
+            } else {
+              // (element, bool) - Element setter
+              bool = !!bool;
+              if (!bool) {
+                disabledElementsLookup.put(node, true);
+              } else if (recordExists) {
+                disabledElementsLookup.remove(node);
+              }
+            }
+          }
+        }
+
+        return bool;
+      }
+    };
+
+    function queueAnimation(element, event, options) {
+      var node, parent;
+      element = stripCommentsFromElement(element);
+      if (element) {
+        node = getDomNode(element);
+        parent = element.parent();
+      }
+
+      options = prepareAnimationOptions(options);
+
+      // we create a fake runner with a working promise.
+      // These methods will become available after the digest has passed
+      var runner = new $$AnimateRunner();
+
+      if (isArray(options.addClass)) {
+        options.addClass = options.addClass.join(' ');
+      }
+
+      if (options.addClass && !isString(options.addClass)) {
+        options.addClass = null;
+      }
+
+      if (isArray(options.removeClass)) {
+        options.removeClass = options.removeClass.join(' ');
+      }
+
+      if (options.removeClass && !isString(options.removeClass)) {
+        options.removeClass = null;
+      }
+
+      if (options.from && !isObject(options.from)) {
+        options.from = null;
+      }
+
+      if (options.to && !isObject(options.to)) {
+        options.to = null;
+      }
+
+      // there are situations where a directive issues an animation for
+      // a jqLite wrapper that contains only comment nodes... If this
+      // happens then there is no way we can perform an animation
+      if (!node) {
+        close();
+        return runner;
+      }
+
+      var className = [node.className, options.addClass, options.removeClass].join(' ');
+      if (!isAnimatableClassName(className)) {
+        close();
+        return runner;
+      }
+
+      var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0;
+
+      // this is a hard disable of all animations for the application or on
+      // the element itself, therefore  there is no need to continue further
+      // past this point if not enabled
+      var skipAnimations = !animationsEnabled || disabledElementsLookup.get(node);
+      var existingAnimation = (!skipAnimations && activeAnimationsLookup.get(node)) || {};
+      var hasExistingAnimation = !!existingAnimation.state;
+
+      // there is no point in traversing the same collection of parent ancestors if a followup
+      // animation will be run on the same element that already did all that checking work
+      if (!skipAnimations && (!hasExistingAnimation || existingAnimation.state != PRE_DIGEST_STATE)) {
+        skipAnimations = !areAnimationsAllowed(element, parent, event);
+      }
+
+      if (skipAnimations) {
+        close();
+        return runner;
+      }
+
+      if (isStructural) {
+        closeChildAnimations(element);
+      }
+
+      var newAnimation = {
+        structural: isStructural,
+        element: element,
+        event: event,
+        close: close,
+        options: options,
+        runner: runner
+      };
+
+      if (hasExistingAnimation) {
+        var skipAnimationFlag = isAllowed('skip', element, newAnimation, existingAnimation);
+        if (skipAnimationFlag) {
+          if (existingAnimation.state === RUNNING_STATE) {
+            close();
+            return runner;
+          } else {
+            mergeAnimationOptions(element, existingAnimation.options, options);
+            return existingAnimation.runner;
+          }
+        }
+
+        var cancelAnimationFlag = isAllowed('cancel', element, newAnimation, existingAnimation);
+        if (cancelAnimationFlag) {
+          if (existingAnimation.state === RUNNING_STATE) {
+            // this will end the animation right away and it is safe
+            // to do so since the animation is already running and the
+            // runner callback code will run in async
+            existingAnimation.runner.end();
+          } else if (existingAnimation.structural) {
+            // this means that the animation is queued into a digest, but
+            // hasn't started yet. Therefore it is safe to run the close
+            // method which will call the runner methods in async.
+            existingAnimation.close();
+          } else {
+            // this will merge the new animation options into existing animation options
+            mergeAnimationOptions(element, existingAnimation.options, newAnimation.options);
+            return existingAnimation.runner;
+          }
+        } else {
+          // a joined animation means that this animation will take over the existing one
+          // so an example would involve a leave animation taking over an enter. Then when
+          // the postDigest kicks in the enter will be ignored.
+          var joinAnimationFlag = isAllowed('join', element, newAnimation, existingAnimation);
+          if (joinAnimationFlag) {
+            if (existingAnimation.state === RUNNING_STATE) {
+              normalizeAnimationOptions(element, options);
+            } else {
+              applyGeneratedPreparationClasses(element, isStructural ? event : null, options);
+
+              event = newAnimation.event = existingAnimation.event;
+              options = mergeAnimationOptions(element, existingAnimation.options, newAnimation.options);
+
+              //we return the same runner since only the option values of this animation will
+              //be fed into the `existingAnimation`.
+              return existingAnimation.runner;
+            }
+          }
+        }
+      } else {
+        // normalization in this case means that it removes redundant CSS classes that
+        // already exist (addClass) or do not exist (removeClass) on the element
+        normalizeAnimationOptions(element, options);
+      }
+
+      // when the options are merged and cleaned up we may end up not having to do
+      // an animation at all, therefore we should check this before issuing a post
+      // digest callback. Structural animations will always run no matter what.
+      var isValidAnimation = newAnimation.structural;
+      if (!isValidAnimation) {
+        // animate (from/to) can be quickly checked first, otherwise we check if any classes are present
+        isValidAnimation = (newAnimation.event === 'animate' && Object.keys(newAnimation.options.to || {}).length > 0)
+                            || hasAnimationClasses(newAnimation.options);
+      }
+
+      if (!isValidAnimation) {
+        close();
+        clearElementAnimationState(element);
+        return runner;
+      }
+
+      applyGeneratedPreparationClasses(element, isStructural ? event : null, options);
+      blockTransitions(node, SAFE_FAST_FORWARD_DURATION_VALUE);
+
+      // the counter keeps track of cancelled animations
+      var counter = (existingAnimation.counter || 0) + 1;
+      newAnimation.counter = counter;
+
+      markElementAnimationState(element, PRE_DIGEST_STATE, newAnimation);
+
+      $rootScope.$$postDigest(function() {
+        var animationDetails = activeAnimationsLookup.get(node);
+        var animationCancelled = !animationDetails;
+        animationDetails = animationDetails || {};
+
+        // if addClass/removeClass is called before something like enter then the
+        // registered parent element may not be present. The code below will ensure
+        // that a final value for parent element is obtained
+        var parentElement = element.parent() || [];
+
+        // animate/structural/class-based animations all have requirements. Otherwise there
+        // is no point in performing an animation. The parent node must also be set.
+        var isValidAnimation = parentElement.length > 0
+                                && (animationDetails.event === 'animate'
+                                    || animationDetails.structural
+                                    || hasAnimationClasses(animationDetails.options));
+
+        // this means that the previous animation was cancelled
+        // even if the follow-up animation is the same event
+        if (animationCancelled || animationDetails.counter !== counter || !isValidAnimation) {
+          // if another animation did not take over then we need
+          // to make sure that the domOperation and options are
+          // handled accordingly
+          if (animationCancelled) {
+            applyAnimationClasses(element, options);
+            applyAnimationStyles(element, options);
+          }
+
+          // if the event changed from something like enter to leave then we do
+          // it, otherwise if it's the same then the end result will be the same too
+          if (animationCancelled || (isStructural && animationDetails.event !== event)) {
+            options.domOperation();
+            runner.end();
+          }
+
+          // in the event that the element animation was not cancelled or a follow-up animation
+          // isn't allowed to animate from here then we need to clear the state of the element
+          // so that any future animations won't read the expired animation data.
+          if (!isValidAnimation) {
+            clearElementAnimationState(element);
+          }
+
+          return;
+        }
+
+        // this combined multiple class to addClass / removeClass into a setClass event
+        // so long as a structural event did not take over the animation
+        event = !animationDetails.structural && hasAnimationClasses(animationDetails.options, true)
+            ? 'setClass'
+            : animationDetails.event;
+
+        markElementAnimationState(element, RUNNING_STATE);
+        var realRunner = $$animation(element, event, animationDetails.options, function(e) {
+          blockTransitions(getDomNode(e), false);
+        });
+
+        realRunner.done(function(status) {
+          close(!status);
+          var animationDetails = activeAnimationsLookup.get(node);
+          if (animationDetails && animationDetails.counter === counter) {
+            clearElementAnimationState(getDomNode(element));
+          }
+          notifyProgress(runner, event, 'close', {});
+        });
+
+        // this will update the runner's flow-control events based on
+        // the `realRunner` object.
+        runner.setHost(realRunner);
+        notifyProgress(runner, event, 'start', {});
+      });
+
+      return runner;
+
+      function notifyProgress(runner, event, phase, data) {
+        triggerCallback(event, element, phase, data);
+        runner.progress(event, phase, data);
+      }
+
+      function close(reject) { // jshint ignore:line
+        clearGeneratedClasses(element, options);
+        applyAnimationClasses(element, options);
+        applyAnimationStyles(element, options);
+        options.domOperation();
+        runner.complete(!reject);
+      }
+    }
+
+    function closeChildAnimations(element) {
+      var node = getDomNode(element);
+      var children = node.querySelectorAll('[' + NG_ANIMATE_ATTR_NAME + ']');
+      forEach(children, function(child) {
+        var state = parseInt(child.getAttribute(NG_ANIMATE_ATTR_NAME));
+        var animationDetails = activeAnimationsLookup.get(child);
+        switch (state) {
+          case RUNNING_STATE:
+            animationDetails.runner.end();
+            /* falls through */
+          case PRE_DIGEST_STATE:
+            if (animationDetails) {
+              activeAnimationsLookup.remove(child);
+            }
+            break;
+        }
+      });
+    }
+
+    function clearElementAnimationState(element) {
+      var node = getDomNode(element);
+      node.removeAttribute(NG_ANIMATE_ATTR_NAME);
+      activeAnimationsLookup.remove(node);
+    }
+
+    function isMatchingElement(nodeOrElmA, nodeOrElmB) {
+      return getDomNode(nodeOrElmA) === getDomNode(nodeOrElmB);
+    }
+
+    function areAnimationsAllowed(element, parentElement, event) {
+      var bodyElementDetected = isMatchingElement(element, $$body) || element[0].nodeName === 'HTML';
+      var rootElementDetected = isMatchingElement(element, $rootElement);
+      var parentAnimationDetected = false;
+      var animateChildren;
+
+      var parentHost = element.data(NG_ANIMATE_PIN_DATA);
+      if (parentHost) {
+        parentElement = parentHost;
+      }
+
+      while (parentElement && parentElement.length) {
+        if (!rootElementDetected) {
+          // angular doesn't want to attempt to animate elements outside of the application
+          // therefore we need to ensure that the rootElement is an ancestor of the current element
+          rootElementDetected = isMatchingElement(parentElement, $rootElement);
+        }
+
+        var parentNode = parentElement[0];
+        if (parentNode.nodeType !== ELEMENT_NODE) {
+          // no point in inspecting the #document element
+          break;
+        }
+
+        var details = activeAnimationsLookup.get(parentNode) || {};
+        // either an enter, leave or move animation will commence
+        // therefore we can't allow any animations to take place
+        // but if a parent animation is class-based then that's ok
+        if (!parentAnimationDetected) {
+          parentAnimationDetected = details.structural || disabledElementsLookup.get(parentNode);
+        }
+
+        if (isUndefined(animateChildren) || animateChildren === true) {
+          var value = parentElement.data(NG_ANIMATE_CHILDREN_DATA);
+          if (isDefined(value)) {
+            animateChildren = value;
+          }
+        }
+
+        // there is no need to continue traversing at this point
+        if (parentAnimationDetected && animateChildren === false) break;
+
+        if (!rootElementDetected) {
+          // angular doesn't want to attempt to animate elements outside of the application
+          // therefore we need to ensure that the rootElement is an ancestor of the current element
+          rootElementDetected = isMatchingElement(parentElement, $rootElement);
+          if (!rootElementDetected) {
+            parentHost = parentElement.data(NG_ANIMATE_PIN_DATA);
+            if (parentHost) {
+              parentElement = parentHost;
+            }
+          }
+        }
+
+        if (!bodyElementDetected) {
+          // we also need to ensure that the element is or will be apart of the body element
+          // otherwise it is pointless to even issue an animation to be rendered
+          bodyElementDetected = isMatchingElement(parentElement, $$body);
+        }
+
+        parentElement = parentElement.parent();
+      }
+
+      var allowAnimation = !parentAnimationDetected || animateChildren;
+      return allowAnimation && rootElementDetected && bodyElementDetected;
+    }
+
+    function markElementAnimationState(element, state, details) {
+      details = details || {};
+      details.state = state;
+
+      var node = getDomNode(element);
+      node.setAttribute(NG_ANIMATE_ATTR_NAME, state);
+
+      var oldValue = activeAnimationsLookup.get(node);
+      var newValue = oldValue
+          ? extend(oldValue, details)
+          : details;
+      activeAnimationsLookup.put(node, newValue);
+    }
+  }];
+}];
diff --git a/src/ngAnimate/animateRunner.js b/src/ngAnimate/animateRunner.js
new file mode 100644
index 000000000000..65b1e8d48030
--- /dev/null
+++ b/src/ngAnimate/animateRunner.js
@@ -0,0 +1,151 @@
+'use strict';
+
+var $$rAFMutexFactory = ['$$rAF', function($$rAF) {
+  return function() {
+    var passed = false;
+    $$rAF(function() {
+      passed = true;
+    });
+    return function(fn) {
+      passed ? fn() : $$rAF(fn);
+    };
+  };
+}];
+
+var $$AnimateRunnerFactory = ['$q', '$$rAFMutex', function($q, $$rAFMutex) {
+  var INITIAL_STATE = 0;
+  var DONE_PENDING_STATE = 1;
+  var DONE_COMPLETE_STATE = 2;
+
+  AnimateRunner.chain = function(chain, callback) {
+    var index = 0;
+
+    next();
+    function next() {
+      if (index === chain.length) {
+        callback(true);
+        return;
+      }
+
+      chain[index](function(response) {
+        if (response === false) {
+          callback(false);
+          return;
+        }
+        index++;
+        next();
+      });
+    }
+  };
+
+  AnimateRunner.all = function(runners, callback) {
+    var count = 0;
+    var status = true;
+    forEach(runners, function(runner) {
+      runner.done(onProgress);
+    });
+
+    function onProgress(response) {
+      status = status && response;
+      if (++count === runners.length) {
+        callback(status);
+      }
+    }
+  };
+
+  function AnimateRunner(host) {
+    this.setHost(host);
+
+    this._doneCallbacks = [];
+    this._runInAnimationFrame = $$rAFMutex();
+    this._state = 0;
+  }
+
+  AnimateRunner.prototype = {
+    setHost: function(host) {
+      this.host = host || {};
+    },
+
+    done: function(fn) {
+      if (this._state === DONE_COMPLETE_STATE) {
+        fn();
+      } else {
+        this._doneCallbacks.push(fn);
+      }
+    },
+
+    progress: noop,
+
+    getPromise: function() {
+      if (!this.promise) {
+        var self = this;
+        this.promise = $q(function(resolve, reject) {
+          self.done(function(status) {
+            status === false ? reject() : resolve();
+          });
+        });
+      }
+      return this.promise;
+    },
+
+    then: function(resolveHandler, rejectHandler) {
+      return this.getPromise().then(resolveHandler, rejectHandler);
+    },
+
+    'catch': function(handler) {
+      return this.getPromise()['catch'](handler);
+    },
+
+    'finally': function(handler) {
+      return this.getPromise()['finally'](handler);
+    },
+
+    pause: function() {
+      if (this.host.pause) {
+        this.host.pause();
+      }
+    },
+
+    resume: function() {
+      if (this.host.resume) {
+        this.host.resume();
+      }
+    },
+
+    end: function() {
+      if (this.host.end) {
+        this.host.end();
+      }
+      this._resolve(true);
+    },
+
+    cancel: function() {
+      if (this.host.cancel) {
+        this.host.cancel();
+      }
+      this._resolve(false);
+    },
+
+    complete: function(response) {
+      var self = this;
+      if (self._state === INITIAL_STATE) {
+        self._state = DONE_PENDING_STATE;
+        self._runInAnimationFrame(function() {
+          self._resolve(response);
+        });
+      }
+    },
+
+    _resolve: function(response) {
+      if (this._state !== DONE_COMPLETE_STATE) {
+        forEach(this._doneCallbacks, function(fn) {
+          fn(response);
+        });
+        this._doneCallbacks.length = 0;
+        this._state = DONE_COMPLETE_STATE;
+      }
+    }
+  };
+
+  return AnimateRunner;
+}];
diff --git a/src/ngAnimate/animation.js b/src/ngAnimate/animation.js
new file mode 100644
index 000000000000..581263b12338
--- /dev/null
+++ b/src/ngAnimate/animation.js
@@ -0,0 +1,432 @@
+'use strict';
+
+var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
+  var NG_ANIMATE_REF_ATTR = 'ng-animate-ref';
+
+  var drivers = this.drivers = [];
+
+  var RUNNER_STORAGE_KEY = '$$animationRunner';
+
+  function setRunner(element, runner) {
+    element.data(RUNNER_STORAGE_KEY, runner);
+  }
+
+  function removeRunner(element) {
+    element.removeData(RUNNER_STORAGE_KEY);
+  }
+
+  function getRunner(element) {
+    return element.data(RUNNER_STORAGE_KEY);
+  }
+
+  this.$get = ['$$jqLite', '$rootScope', '$injector', '$$AnimateRunner', '$$HashMap', '$$forceReflow',
+       function($$jqLite,   $rootScope,   $injector,   $$AnimateRunner,   $$HashMap,   $$forceReflow) {
+
+    var animationQueue = [];
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+
+    function sortAnimations(animations) {
+      var tree = { children: [] };
+      var i, lookup = new $$HashMap();
+
+      // this is done first beforehand so that the hashmap
+      // is filled with a list of the elements that will be animated
+      for (i = 0; i < animations.length; i++) {
+        var animation = animations[i];
+        lookup.put(animation.domNode, animations[i] = {
+          domNode: animation.domNode,
+          fn: animation.fn,
+          children: []
+        });
+      }
+
+      for (i = 0; i < animations.length; i++) {
+        processNode(animations[i]);
+      }
+
+      return flatten(tree);
+
+      function processNode(entry) {
+        if (entry.processed) return entry;
+        entry.processed = true;
+
+        var elementNode = entry.domNode;
+        var parentNode = elementNode.parentNode;
+        lookup.put(elementNode, entry);
+
+        var parentEntry;
+        while (parentNode) {
+          parentEntry = lookup.get(parentNode);
+          if (parentEntry) {
+            if (!parentEntry.processed) {
+              parentEntry = processNode(parentEntry);
+            }
+            break;
+          }
+          parentNode = parentNode.parentNode;
+        }
+
+        (parentEntry || tree).children.push(entry);
+        return entry;
+      }
+
+      function flatten(tree) {
+        var result = [];
+        var queue = [];
+        var i;
+
+        for (i = 0; i < tree.children.length; i++) {
+          queue.push(tree.children[i]);
+        }
+
+        var remainingLevelEntries = queue.length;
+        var nextLevelEntries = 0;
+        var row = [];
+
+        for (i = 0; i < queue.length; i++) {
+          var entry = queue[i];
+          if (remainingLevelEntries <= 0) {
+            remainingLevelEntries = nextLevelEntries;
+            nextLevelEntries = 0;
+            result = result.concat(row);
+            row = [];
+          }
+          row.push({
+            fn: entry.fn,
+            terminal: entry.children.length === 0
+          });
+          entry.children.forEach(function(childEntry) {
+            nextLevelEntries++;
+            queue.push(childEntry);
+          });
+          remainingLevelEntries--;
+        }
+
+        if (row.length) {
+          result = result.concat(row);
+        }
+
+        var terminalAnimations = [];
+        var parentAnimations = [];
+        forEach(result, function(result) {
+          if (result.terminal) {
+            terminalAnimations.push(result.fn);
+          } else {
+            parentAnimations.push(result.fn);
+          }
+        });
+        return [parentAnimations, terminalAnimations];
+      }
+    }
+
+    // TODO(matsko): document the signature in a better way
+    return function(element, event, options, onBeforeClassesAppliedCb) {
+      options = prepareAnimationOptions(options);
+      var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0;
+
+      // there is no animation at the current moment, however
+      // these runner methods will get later updated with the
+      // methods leading into the driver's end/cancel methods
+      // for now they just stop the animation from starting
+      var runner = new $$AnimateRunner({
+        end: function() { close(); },
+        cancel: function() { close(true); }
+      });
+
+      if (!drivers.length) {
+        close();
+        return runner;
+      }
+
+      setRunner(element, runner);
+
+      var classes = mergeClasses(element.attr('class'), mergeClasses(options.addClass, options.removeClass));
+      var tempClasses = options.tempClasses;
+      if (tempClasses) {
+        classes += ' ' + tempClasses;
+        options.tempClasses = null;
+      }
+
+      animationQueue.push({
+        // this data is used by the postDigest code and passed into
+        // the driver step function
+        element: element,
+        classes: classes,
+        event: event,
+        structural: isStructural,
+        options: options,
+        beforeStart: beforeStart,
+        close: close
+      });
+
+      element.on('$destroy', handleDestroyedElement);
+
+      // we only want there to be one function called within the post digest
+      // block. This way we can group animations for all the animations that
+      // were apart of the same postDigest flush call.
+      if (animationQueue.length > 1) return runner;
+
+      $rootScope.$$postDigest(function() {
+        var animations = [];
+        forEach(animationQueue, function(entry) {
+          // the element was destroyed early on which removed the runner
+          // form its storage. This means we can't animate this element
+          // at all and it already has been closed due to destruction.
+          var elm = entry.element;
+          if (getRunner(elm) && getDomNode(elm).parentNode) {
+            animations.push(entry);
+          } else {
+            entry.close();
+          }
+        });
+
+        // now any future animations will be in another postDigest
+        animationQueue.length = 0;
+
+        var groupedAnimations = groupAnimations(animations);
+        var toBeSortedAnimations = [];
+
+        forEach(groupedAnimations, function(animationEntry) {
+          toBeSortedAnimations.push({
+            domNode: getDomNode(animationEntry.from ? animationEntry.from.element : animationEntry.element),
+            fn: function triggerAnimationStart() {
+              // it's important that we apply the `ng-animate` CSS class and the
+              // temporary classes before we do any driver invoking since these
+              // CSS classes may be required for proper CSS detection.
+              animationEntry.beforeStart();
+
+              var startAnimationFn, closeFn = animationEntry.close;
+
+              // in the event that the element was removed before the digest runs or
+              // during the RAF sequencing then we should not trigger the animation.
+              var targetElement = animationEntry.anchors
+                  ? (animationEntry.from.element || animationEntry.to.element)
+                  : animationEntry.element;
+
+              if (getRunner(targetElement)) {
+                var operation = invokeFirstDriver(animationEntry, onBeforeClassesAppliedCb);
+                if (operation) {
+                  startAnimationFn = operation.start;
+                }
+              }
+
+              if (!startAnimationFn) {
+                closeFn();
+              } else {
+                var animationRunner = startAnimationFn();
+                animationRunner.done(function(status) {
+                  closeFn(!status);
+                });
+                updateAnimationRunners(animationEntry, animationRunner);
+              }
+            }
+          });
+        });
+
+        // we need to sort each of the animations in order of parent to child
+        // relationships. This ensures that the child classes are applied at the
+        // right time.
+        var anim = sortAnimations(toBeSortedAnimations);
+        var finalLevel = anim.length - 1;
+
+        // sortAnimations will return two lists of animations. The first list
+        // is all of the parent animations that are likely class-based and the
+        // second list is a collection of the rest. Before we run the second
+        // list we must ensure that atleast one reflow has been passed such that
+        // the preparation classes (ng-enter, class-add, etc...) have been applied
+        // to their associated element.
+        if (anim[0].length) {
+          forEach(anim[0], function(triggerAnimation) {
+            $$forceReflow();
+            triggerAnimation();
+          });
+        } else {
+          $$forceReflow();
+        }
+
+        forEach(anim[1], function(triggerAnimation) {
+          triggerAnimation();
+        });
+      });
+
+      return runner;
+
+      // TODO(matsko): change to reference nodes
+      function getAnchorNodes(node) {
+        var SELECTOR = '[' + NG_ANIMATE_REF_ATTR + ']';
+        var items = node.hasAttribute(NG_ANIMATE_REF_ATTR)
+              ? [node]
+              : node.querySelectorAll(SELECTOR);
+        var anchors = [];
+        forEach(items, function(node) {
+          var attr = node.getAttribute(NG_ANIMATE_REF_ATTR);
+          if (attr && attr.length) {
+            anchors.push(node);
+          }
+        });
+        return anchors;
+      }
+
+      function groupAnimations(animations) {
+        var preparedAnimations = [];
+        var refLookup = {};
+        forEach(animations, function(animation, index) {
+          var element = animation.element;
+          var node = getDomNode(element);
+          var event = animation.event;
+          var enterOrMove = ['enter', 'move'].indexOf(event) >= 0;
+          var anchorNodes = animation.structural ? getAnchorNodes(node) : [];
+
+          if (anchorNodes.length) {
+            var direction = enterOrMove ? 'to' : 'from';
+
+            forEach(anchorNodes, function(anchor) {
+              var key = anchor.getAttribute(NG_ANIMATE_REF_ATTR);
+              refLookup[key] = refLookup[key] || {};
+              refLookup[key][direction] = {
+                animationID: index,
+                element: jqLite(anchor)
+              };
+            });
+          } else {
+            preparedAnimations.push(animation);
+          }
+        });
+
+        var usedIndicesLookup = {};
+        var anchorGroups = {};
+        forEach(refLookup, function(operations, key) {
+          var from = operations.from;
+          var to = operations.to;
+
+          if (!from || !to) {
+            // only one of these is set therefore we can't have an
+            // anchor animation since all three pieces are required
+            var index = from ? from.animationID : to.animationID;
+            var indexKey = index.toString();
+            if (!usedIndicesLookup[indexKey]) {
+              usedIndicesLookup[indexKey] = true;
+              preparedAnimations.push(animations[index]);
+            }
+            return;
+          }
+
+          var fromAnimation = animations[from.animationID];
+          var toAnimation = animations[to.animationID];
+          var lookupKey = from.animationID.toString();
+          if (!anchorGroups[lookupKey]) {
+            var group = anchorGroups[lookupKey] = {
+              // TODO(matsko): double-check this code
+              beforeStart: function() {
+                fromAnimation.beforeStart();
+                toAnimation.beforeStart();
+              },
+              close: function() {
+                fromAnimation.close();
+                toAnimation.close();
+              },
+              classes: cssClassesIntersection(fromAnimation.classes, toAnimation.classes),
+              from: fromAnimation,
+              to: toAnimation,
+              anchors: [] // TODO(matsko): change to reference nodes
+            };
+
+            // the anchor animations require that the from and to elements both have at least
+            // one shared CSS class which effictively marries the two elements together to use
+            // the same animation driver and to properly sequence the anchor animation.
+            if (group.classes.length) {
+              preparedAnimations.push(group);
+            } else {
+              preparedAnimations.push(fromAnimation);
+              preparedAnimations.push(toAnimation);
+            }
+          }
+
+          anchorGroups[lookupKey].anchors.push({
+            'out': from.element, 'in': to.element
+          });
+        });
+
+        return preparedAnimations;
+      }
+
+      function cssClassesIntersection(a,b) {
+        a = a.split(' ');
+        b = b.split(' ');
+        var matches = [];
+
+        for (var i = 0; i < a.length; i++) {
+          var aa = a[i];
+          if (aa.substring(0,3) === 'ng-') continue;
+
+          for (var j = 0; j < b.length; j++) {
+            if (aa === b[j]) {
+              matches.push(aa);
+              break;
+            }
+          }
+        }
+
+        return matches.join(' ');
+      }
+
+      function invokeFirstDriver(animationDetails, onBeforeClassesAppliedCb) {
+        // we loop in reverse order since the more general drivers (like CSS and JS)
+        // may attempt more elements, but custom drivers are more particular
+        for (var i = drivers.length - 1; i >= 0; i--) {
+          var driverName = drivers[i];
+          if (!$injector.has(driverName)) continue; // TODO(matsko): remove this check
+
+          var factory = $injector.get(driverName);
+          var driver = factory(animationDetails, onBeforeClassesAppliedCb);
+          if (driver) {
+            return driver;
+          }
+        }
+      }
+
+      function beforeStart() {
+        element.addClass(NG_ANIMATE_CLASSNAME);
+        if (tempClasses) {
+          $$jqLite.addClass(element, tempClasses);
+        }
+      }
+
+      function updateAnimationRunners(animation, newRunner) {
+        if (animation.from && animation.to) {
+          update(animation.from.element);
+          update(animation.to.element);
+        } else {
+          update(animation.element);
+        }
+
+        function update(element) {
+          getRunner(element).setHost(newRunner);
+        }
+      }
+
+      function handleDestroyedElement() {
+        var runner = getRunner(element);
+        if (runner && (event !== 'leave' || !options.$$domOperationFired)) {
+          runner.end();
+        }
+      }
+
+      function close(rejected) { // jshint ignore:line
+        element.off('$destroy', handleDestroyedElement);
+        removeRunner(element);
+
+        applyAnimationClasses(element, options);
+        applyAnimationStyles(element, options);
+        options.domOperation();
+
+        if (tempClasses) {
+          $$jqLite.removeClass(element, tempClasses);
+        }
+
+        element.removeClass(NG_ANIMATE_CLASSNAME);
+        runner.complete(!rejected);
+      }
+    };
+  }];
+}];
diff --git a/src/ngAnimate/body.js b/src/ngAnimate/body.js
new file mode 100644
index 000000000000..8c8ce21ac9e8
--- /dev/null
+++ b/src/ngAnimate/body.js
@@ -0,0 +1,7 @@
+'use strict';
+
+function $$BodyProvider() {
+  this.$get = ['$document', function($document) {
+    return jqLite($document[0].body);
+  }];
+}
diff --git a/src/ngAnimate/module.js b/src/ngAnimate/module.js
new file mode 100644
index 000000000000..0f12f0c24d29
--- /dev/null
+++ b/src/ngAnimate/module.js
@@ -0,0 +1,759 @@
+'use strict';
+
+/* global angularAnimateModule: true,
+
+   $$BodyProvider,
+   $$rAFMutexFactory,
+   $$AnimateChildrenDirective,
+   $$AnimateRunnerFactory,
+   $$AnimateQueueProvider,
+   $$AnimationProvider,
+   $AnimateCssProvider,
+   $$AnimateCssDriverProvider,
+   $$AnimateJsProvider,
+   $$AnimateJsDriverProvider,
+*/
+
+/**
+ * @ngdoc module
+ * @name ngAnimate
+ * @description
+ *
+ * The `ngAnimate` module provides support for CSS-based animations (keyframes and transitions) as well as JavaScript-based animations via
+ * callback hooks. Animations are not enabled by default, however, by including `ngAnimate` then the animation hooks are enabled for an Angular app.
+ *
+ * <div doc-module-components="ngAnimate"></div>
+ *
+ * # Usage
+ * Simply put, there are two ways to make use of animations when ngAnimate is used: by using **CSS** and **JavaScript**. The former works purely based
+ * using CSS (by using matching CSS selectors/styles) and the latter triggers animations that are registered via `module.animation()`. For
+ * both CSS and JS animations the sole requirement is to have a matching `CSS class` that exists both in the registered animation and within
+ * the HTML element that the animation will be triggered on.
+ *
+ * ## Directive Support
+ * The following directives are "animation aware":
+ *
+ * | Directive                                                                                                | Supported Animations                                                     |
+ * |----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------|
+ * | {@link ng.directive:ngRepeat#animations ngRepeat}                                                        | enter, leave and move                                                    |
+ * | {@link ngRoute.directive:ngView#animations ngView}                                                       | enter and leave                                                          |
+ * | {@link ng.directive:ngInclude#animations ngInclude}                                                      | enter and leave                                                          |
+ * | {@link ng.directive:ngSwitch#animations ngSwitch}                                                        | enter and leave                                                          |
+ * | {@link ng.directive:ngIf#animations ngIf}                                                                | enter and leave                                                          |
+ * | {@link ng.directive:ngClass#animations ngClass}                                                          | add and remove (the CSS class(es) present)                               |
+ * | {@link ng.directive:ngShow#animations ngShow} & {@link ng.directive:ngHide#animations ngHide}            | add and remove (the ng-hide class value)                                 |
+ * | {@link ng.directive:form#animation-hooks form} & {@link ng.directive:ngModel#animation-hooks ngModel}    | add and remove (dirty, pristine, valid, invalid & all other validations) |
+ * | {@link module:ngMessages#animations ngMessages}                                                          | add and remove (ng-active & ng-inactive)                                 |
+ * | {@link module:ngMessages#animations ngMessage}                                                           | enter and leave                                                          |
+ *
+ * (More information can be found by visiting each the documentation associated with each directive.)
+ *
+ * ## CSS-based Animations
+ *
+ * CSS-based animations with ngAnimate are unique since they require no JavaScript code at all. By using a CSS class that we reference between our HTML
+ * and CSS code we can create an animation that will be picked up by Angular when an the underlying directive performs an operation.
+ *
+ * The example below shows how an `enter` animation can be made possible on a element using `ng-if`:
+ *
+ * ```html
+ * <div ng-if="bool" class="fade">
+ *    Fade me in out
+ * </div>
+ * <button ng-click="bool=true">Fade In!</button>
+ * <button ng-click="bool=false">Fade Out!</button>
+ * ```
+ *
+ * Notice the CSS class **fade**? We can now create the CSS transition code that references this class:
+ *
+ * ```css
+ * /&#42; The starting CSS styles for the enter animation &#42;/
+ * .fade.ng-enter {
+ *   transition:0.5s linear all;
+ *   opacity:0;
+ * }
+ *
+ * /&#42; The finishing CSS styles for the enter animation &#42;/
+ * .fade.ng-enter.ng-enter-active {
+ *   opacity:1;
+ * }
+ * ```
+ *
+ * The key thing to remember here is that, depending on the animation event (which each of the directives above trigger depending on what's going on) two
+ * generated CSS classes will be applied to the element; in the example above we have `.ng-enter` and `.ng-enter-active`. For CSS transitions, the transition
+ * code **must** be defined within the starting CSS class (in this case `.ng-enter`). The destination class is what the transition will animate towards.
+ *
+ * If for example we wanted to create animations for `leave` and `move` (ngRepeat triggers move) then we can do so using the same CSS naming conventions:
+ *
+ * ```css
+ * /&#42; now the element will fade out before it is removed from the DOM &#42;/
+ * .fade.ng-leave {
+ *   transition:0.5s linear all;
+ *   opacity:1;
+ * }
+ * .fade.ng-leave.ng-leave-active {
+ *   opacity:0;
+ * }
+ * ```
+ *
+ * We can also make use of **CSS Keyframes** by referencing the keyframe animation within the starting CSS class:
+ *
+ * ```css
+ * /&#42; there is no need to define anything inside of the destination
+ * CSS class since the keyframe will take charge of the animation &#42;/
+ * .fade.ng-leave {
+ *   animation: my_fade_animation 0.5s linear;
+ *   -webkit-animation: my_fade_animation 0.5s linear;
+ * }
+ *
+ * @keyframes my_fade_animation {
+ *   from { opacity:1; }
+ *   to { opacity:0; }
+ * }
+ *
+ * @-webkit-keyframes my_fade_animation {
+ *   from { opacity:1; }
+ *   to { opacity:0; }
+ * }
+ * ```
+ *
+ * Feel free also mix transitions and keyframes together as well as any other CSS classes on the same element.
+ *
+ * ### CSS Class-based Animations
+ *
+ * Class-based animations (animations that are triggered via `ngClass`, `ngShow`, `ngHide` and some other directives) have a slightly different
+ * naming convention. Class-based animations are basic enough that a standard transition or keyframe can be referenced on the class being added
+ * and removed.
+ *
+ * For example if we wanted to do a CSS animation for `ngHide` then we place an animation on the `.ng-hide` CSS class:
+ *
+ * ```html
+ * <div ng-show="bool" class="fade">
+ *   Show and hide me
+ * </div>
+ * <button ng-click="bool=true">Toggle</button>
+ *
+ * <style>
+ * .fade.ng-hide {
+ *   transition:0.5s linear all;
+ *   opacity:0;
+ * }
+ * </style>
+ * ```
+ *
+ * All that is going on here with ngShow/ngHide behind the scenes is the `.ng-hide` class is added/removed (when the hidden state is valid). Since
+ * ngShow and ngHide are animation aware then we can match up a transition and ngAnimate handles the rest.
+ *
+ * In addition the addition and removal of the CSS class, ngAnimate also provides two helper methods that we can use to further decorate the animation
+ * with CSS styles.
+ *
+ * ```html
+ * <div ng-class="{on:onOff}" class="highlight">
+ *   Highlight this box
+ * </div>
+ * <button ng-click="onOff=!onOff">Toggle</button>
+ *
+ * <style>
+ * .highlight {
+ *   transition:0.5s linear all;
+ * }
+ * .highlight.on-add {
+ *   background:white;
+ * }
+ * .highlight.on {
+ *   background:yellow;
+ * }
+ * .highlight.on-remove {
+ *   background:black;
+ * }
+ * </style>
+ * ```
+ *
+ * We can also make use of CSS keyframes by placing them within the CSS classes.
+ *
+ *
+ * ### CSS Staggering Animations
+ * A Staggering animation is a collection of animations that are issued with a slight delay in between each successive operation resulting in a
+ * curtain-like effect. The ngAnimate module (versions >=1.2) supports staggering animations and the stagger effect can be
+ * performed by creating a **ng-EVENT-stagger** CSS class and attaching that class to the base CSS class used for
+ * the animation. The style property expected within the stagger class can either be a **transition-delay** or an
+ * **animation-delay** property (or both if your animation contains both transitions and keyframe animations).
+ *
+ * ```css
+ * .my-animation.ng-enter {
+ *   /&#42; standard transition code &#42;/
+ *   transition: 1s linear all;
+ *   opacity:0;
+ * }
+ * .my-animation.ng-enter-stagger {
+ *   /&#42; this will have a 100ms delay between each successive leave animation &#42;/
+ *   transition-delay: 0.1s;
+ *
+ *   /&#42; in case the stagger doesn't work then the duration value
+ *    must be set to 0 to avoid an accidental CSS inheritance &#42;/
+ *   transition-duration: 0s;
+ * }
+ * .my-animation.ng-enter.ng-enter-active {
+ *   /&#42; standard transition styles &#42;/
+ *   opacity:1;
+ * }
+ * ```
+ *
+ * Staggering animations work by default in ngRepeat (so long as the CSS class is defined). Outside of ngRepeat, to use staggering animations
+ * on your own, they can be triggered by firing multiple calls to the same event on $animate. However, the restrictions surrounding this
+ * are that each of the elements must have the same CSS className value as well as the same parent element. A stagger operation
+ * will also be reset if one or more animation frames have passed since the multiple calls to `$animate` were fired.
+ *
+ * The following code will issue the **ng-leave-stagger** event on the element provided:
+ *
+ * ```js
+ * var kids = parent.children();
+ *
+ * $animate.leave(kids[0]); //stagger index=0
+ * $animate.leave(kids[1]); //stagger index=1
+ * $animate.leave(kids[2]); //stagger index=2
+ * $animate.leave(kids[3]); //stagger index=3
+ * $animate.leave(kids[4]); //stagger index=4
+ *
+ * window.requestAnimationFrame(function() {
+ *   //stagger has reset itself
+ *   $animate.leave(kids[5]); //stagger index=0
+ *   $animate.leave(kids[6]); //stagger index=1
+ *
+ *   $scope.$digest();
+ * });
+ * ```
+ *
+ * Stagger animations are currently only supported within CSS-defined animations.
+ *
+ * ### The `ng-animate` CSS class
+ *
+ * When ngAnimate is animating an element it will apply the `ng-animate` CSS class to the element for the duration of the animation.
+ * This is a temporary CSS class and it will be removed once the animation is over (for both JavaScript and CSS-based animations).
+ *
+ * Therefore, animations can be applied to an element using this temporary class directly via CSS.
+ *
+ * ```css
+ * .zipper.ng-animate {
+ *   transition:0.5s linear all;
+ * }
+ * .zipper.ng-enter {
+ *   opacity:0;
+ * }
+ * .zipper.ng-enter.ng-enter-active {
+ *   opacity:1;
+ * }
+ * .zipper.ng-leave {
+ *   opacity:1;
+ * }
+ * .zipper.ng-leave.ng-leave-active {
+ *   opacity:0;
+ * }
+ * ```
+ *
+ * (Note that the `ng-animate` CSS class is reserved and it cannot be applied on an element directly since ngAnimate will always remove
+ * the CSS class once an animation has completed.)
+ *
+ *
+ * ## JavaScript-based Animations
+ *
+ * ngAnimate also allows for animations to be consumed by JavaScript code. The approach is similar to CSS-based animations (where there is a shared
+ * CSS class that is referenced in our HTML code) but in addition we need to register the JavaScript animation on the module. By making use of the
+ * `module.animation()` module function we can register the ainmation.
+ *
+ * Let's see an example of a enter/leave animation using `ngRepeat`:
+ *
+ * ```html
+ * <div ng-repeat="item in items" class="slide">
+ *   {{ item }}
+ * </div>
+ * ```
+ *
+ * See the **slide** CSS class? Let's use that class to define an animation that we'll structure in our module code by using `module.animation`:
+ *
+ * ```js
+ * myModule.animation('.slide', [function() {
+ *   return {
+ *     // make note that other events (like addClass/removeClass)
+ *     // have different function input parameters
+ *     enter: function(element, doneFn) {
+ *       jQuery(element).fadeIn(1000, doneFn);
+ *
+ *       // remember to call doneFn so that angular
+ *       // knows that the animation has concluded
+ *     },
+ *
+ *     move: function(element, doneFn) {
+ *       jQuery(element).fadeIn(1000, doneFn);
+ *     },
+ *
+ *     leave: function(element, doneFn) {
+ *       jQuery(element).fadeOut(1000, doneFn);
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * The nice thing about JS-based animations is that we can inject other services and make use of advanced animation libraries such as
+ * greensock.js and velocity.js.
+ *
+ * If our animation code class-based (meaning that something like `ngClass`, `ngHide` and `ngShow` triggers it) then we can still define
+ * our animations inside of the same registered animation, however, the function input arguments are a bit different:
+ *
+ * ```html
+ * <div ng-class="color" class="colorful">
+ *   this box is moody
+ * </div>
+ * <button ng-click="color='red'">Change to red</button>
+ * <button ng-click="color='blue'">Change to blue</button>
+ * <button ng-click="color='green'">Change to green</button>
+ * ```
+ *
+ * ```js
+ * myModule.animation('.colorful', [function() {
+ *   return {
+ *     addClass: function(element, className, doneFn) {
+ *       // do some cool animation and call the doneFn
+ *     },
+ *     removeClass: function(element, className, doneFn) {
+ *       // do some cool animation and call the doneFn
+ *     },
+ *     setClass: function(element, addedClass, removedClass, doneFn) {
+ *       // do some cool animation and call the doneFn
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * ## CSS + JS Animations Together
+ *
+ * AngularJS 1.4 and higher has taken steps to make the amalgamation of CSS and JS animations more flexible. However, unlike earlier versions of Angular,
+ * defining CSS and JS animations to work off of the same CSS class will not work anymore. Therefore the example below will only result in **JS animations taking
+ * charge of the animation**:
+ *
+ * ```html
+ * <div ng-if="bool" class="slide">
+ *   Slide in and out
+ * </div>
+ * ```
+ *
+ * ```js
+ * myModule.animation('.slide', [function() {
+ *   return {
+ *     enter: function(element, doneFn) {
+ *       jQuery(element).slideIn(1000, doneFn);
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * ```css
+ * .slide.ng-enter {
+ *   transition:0.5s linear all;
+ *   transform:translateY(-100px);
+ * }
+ * .slide.ng-enter.ng-enter-active {
+ *   transform:translateY(0);
+ * }
+ * ```
+ *
+ * Does this mean that CSS and JS animations cannot be used together? Do JS-based animations always have higher priority? We can make up for the
+ * lack of CSS animations by using the `$animateCss` service to trigger our own tweaked-out, CSS-based animations directly from
+ * our own JS-based animation code:
+ *
+ * ```js
+ * myModule.animation('.slide', ['$animateCss', function($animateCss) {
+ *   return {
+ *     enter: function(element, doneFn) {
+*        // this will trigger `.slide.ng-enter` and `.slide.ng-enter-active`.
+ *       var runner = $animateCss(element, {
+ *         event: 'enter',
+ *         structural: true
+ *       }).start();
+*        runner.done(doneFn);
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * The nice thing here is that we can save bandwidth by sticking to our CSS-based animation code and we don't need to rely on a 3rd-party animation framework.
+ *
+ * The `$animateCss` service is very powerful since we can feed in all kinds of extra properties that will be evaluated and fed into a CSS transition or
+ * keyframe animation. For example if we wanted to animate the height of an element while adding and removing classes then we can do so by providing that
+ * data into `$animateCss` directly:
+ *
+ * ```js
+ * myModule.animation('.slide', ['$animateCss', function($animateCss) {
+ *   return {
+ *     enter: function(element, doneFn) {
+ *       var runner = $animateCss(element, {
+ *         event: 'enter',
+ *         structural: true,
+ *         addClass: 'maroon-setting',
+ *         from: { height:0 },
+ *         to: { height: 200 }
+ *       }).start();
+ *
+ *       runner.done(doneFn);
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * Now we can fill in the rest via our transition CSS code:
+ *
+ * ```css
+ * /&#42; the transition tells ngAnimate to make the animation happen &#42;/
+ * .slide.ng-enter { transition:0.5s linear all; }
+ *
+ * /&#42; this extra CSS class will be absorbed into the transition
+ * since the $animateCss code is adding the class &#42;/
+ * .maroon-setting { background:red; }
+ * ```
+ *
+ * And `$animateCss` will figure out the rest. Just make sure to have the `done()` callback fire the `doneFn` function to signal when the animation is over.
+ *
+ * To learn more about what's possible be sure to visit the {@link ngAnimate.$animateCss $animateCss service}.
+ *
+ * ## Animation Anchoring (via `ng-animate-ref`)
+ *
+ * ngAnimate in AngularJS 1.4 comes packed with the ability to cross-animate elements between
+ * structural areas of an application (like views) by pairing up elements using an attribute
+ * called `ng-animate-ref`.
+ *
+ * Let's say for example we have two views that are managed by `ng-view` and we want to show
+ * that there is a relationship between two components situated in within these views. By using the
+ * `ng-animate-ref` attribute we can identify that the two components are paired together and we
+ * can then attach an animation, which is triggered when the view changes.
+ *
+ * Say for example we have the following template code:
+ *
+ * ```html
+ * <!-- index.html -->
+ * <div ng-view class="view-animation">
+ * </div>
+ *
+ * <!-- home.html -->
+ * <a href="#/banner-page">
+ *   <img src="./banner.jpg" class="banner" ng-animate-ref="banner">
+ * </a>
+ *
+ * <!-- banner-page.html -->
+ * <img src="./banner.jpg" class="banner" ng-animate-ref="banner">
+ * ```
+ *
+ * Now, when the view changes (once the link is clicked), ngAnimate will examine the
+ * HTML contents to see if there is a match reference between any components in the view
+ * that is leaving and the view that is entering. It will scan both the view which is being
+ * removed (leave) and inserted (enter) to see if there are any paired DOM elements that
+ * contain a matching ref value.
+ *
+ * The two images match since they share the same ref value. ngAnimate will now create a
+ * transport element (which is a clone of the first image element) and it will then attempt
+ * to animate to the position of the second image element in the next view. For the animation to
+ * work a special CSS class called `ng-anchor` will be added to the transported element.
+ *
+ * We can now attach a transition onto the `.banner.ng-anchor` CSS class and then
+ * ngAnimate will handle the entire transition for us as well as the addition and removal of
+ * any changes of CSS classes between the elements:
+ *
+ * ```css
+ * .banner.ng-anchor {
+ *   /&#42; this animation will last for 1 second since there are
+ *          two phases to the animation (an `in` and an `out` phase) &#42;/
+ *   transition:0.5s linear all;
+ * }
+ * ```
+ *
+ * We also **must** include animations for the views that are being entered and removed
+ * (otherwise anchoring wouldn't be possible since the new view would be inserted right away).
+ *
+ * ```css
+ * .view-animation.ng-enter, .view-animation.ng-leave {
+ *   transition:0.5s linear all;
+ *   position:fixed;
+ *   left:0;
+ *   top:0;
+ *   width:100%;
+ * }
+ * .view-animation.ng-enter {
+ *   transform:translateX(100%);
+ * }
+ * .view-animation.ng-leave,
+ * .view-animation.ng-enter.ng-enter-active {
+ *   transform:translateX(0%);
+ * }
+ * .view-animation.ng-leave.ng-leave-active {
+ *   transform:translateX(-100%);
+ * }
+ * ```
+ *
+ * Now we can jump back to the anchor animation. When the animation happens, there are two stages that occur:
+ * an `out` and an `in` stage. The `out` stage happens first and that is when the element is animated away
+ * from its origin. Once that animation is over then the `in` stage occurs which animates the
+ * element to its destination. The reason why there are two animations is to give enough time
+ * for the enter animation on the new element to be ready.
+ *
+ * The example above sets up a transition for both the in and out phases, but we can also target the out or
+ * in phases directly via `ng-anchor-out` and `ng-anchor-in`.
+ *
+ * ```css
+ * .banner.ng-anchor-out {
+ *   transition: 0.5s linear all;
+ *
+ *   /&#42; the scale will be applied during the out animation,
+ *          but will be animated away when the in animation runs &#42;/
+ *   transform: scale(1.2);
+ * }
+ *
+ * .banner.ng-anchor-in {
+ *   transition: 1s linear all;
+ * }
+ * ```
+ *
+ *
+ *
+ *
+ * ### Anchoring Demo
+ *
+  <example module="anchoringExample"
+           name="anchoringExample"
+           id="anchoringExample"
+           deps="angular-animate.js;angular-route.js"
+           animations="true">
+    <file name="index.html">
+      <a href="#/">Home</a>
+      <hr />
+      <div class="view-container">
+        <div ng-view class="view"></div>
+      </div>
+    </file>
+    <file name="script.js">
+      angular.module('anchoringExample', ['ngAnimate', 'ngRoute'])
+        .config(['$routeProvider', function($routeProvider) {
+          $routeProvider.when('/', {
+            templateUrl: 'home.html',
+            controller: 'HomeController as home'
+          });
+          $routeProvider.when('/profile/:id', {
+            templateUrl: 'profile.html',
+            controller: 'ProfileController as profile'
+          });
+        }])
+        .run(['$rootScope', function($rootScope) {
+          $rootScope.records = [
+            { id:1, title: "Miss Beulah Roob" },
+            { id:2, title: "Trent Morissette" },
+            { id:3, title: "Miss Ava Pouros" },
+            { id:4, title: "Rod Pouros" },
+            { id:5, title: "Abdul Rice" },
+            { id:6, title: "Laurie Rutherford Sr." },
+            { id:7, title: "Nakia McLaughlin" },
+            { id:8, title: "Jordon Blanda DVM" },
+            { id:9, title: "Rhoda Hand" },
+            { id:10, title: "Alexandrea Sauer" }
+          ];
+        }])
+        .controller('HomeController', [function() {
+          //empty
+        }])
+        .controller('ProfileController', ['$rootScope', '$routeParams', function($rootScope, $routeParams) {
+          var index = parseInt($routeParams.id, 10);
+          var record = $rootScope.records[index - 1];
+
+          this.title = record.title;
+          this.id = record.id;
+        }]);
+    </file>
+    <file name="home.html">
+      <h2>Welcome to the home page</h1>
+      <p>Please click on an element</p>
+      <a class="record"
+         ng-href="#/profile/{{ record.id }}"
+         ng-animate-ref="{{ record.id }}"
+         ng-repeat="record in records">
+        {{ record.title }}
+      </a>
+    </file>
+    <file name="profile.html">
+      <div class="profile record" ng-animate-ref="{{ profile.id }}">
+        {{ profile.title }}
+      </div>
+    </file>
+    <file name="animations.css">
+      .record {
+        display:block;
+        font-size:20px;
+      }
+      .profile {
+        background:black;
+        color:white;
+        font-size:100px;
+      }
+      .view-container {
+        position:relative;
+      }
+      .view-container > .view.ng-animate {
+        position:absolute;
+        top:0;
+        left:0;
+        width:100%;
+        min-height:500px;
+      }
+      .view.ng-enter, .view.ng-leave,
+      .record.ng-anchor {
+        transition:0.5s linear all;
+      }
+      .view.ng-enter {
+        transform:translateX(100%);
+      }
+      .view.ng-enter.ng-enter-active, .view.ng-leave {
+        transform:translateX(0%);
+      }
+      .view.ng-leave.ng-leave-active {
+        transform:translateX(-100%);
+      }
+      .record.ng-anchor-out {
+        background:red;
+      }
+    </file>
+  </example>
+ *
+ * ### How is the element transported?
+ *
+ * When an anchor animation occurs, ngAnimate will clone the starting element and position it exactly where the starting
+ * element is located on screen via absolute positioning. The cloned element will be placed inside of the root element
+ * of the application (where ng-app was defined) and all of the CSS classes of the starting element will be applied. The
+ * element will then animate into the `out` and `in` animations and will eventually reach the coordinates and match
+ * the dimensions of the destination element. During the entire animation a CSS class of `.ng-animate-shim` will be applied
+ * to both the starting and destination elements in order to hide them from being visible (the CSS styling for the class
+ * is: `visibility:hidden`). Once the anchor reaches its destination then it will be removed and the destination element
+ * will become visible since the shim class will be removed.
+ *
+ * ### How is the morphing handled?
+ *
+ * CSS Anchoring relies on transitions and keyframes and the internal code is intelligent enough to figure out
+ * what CSS classes differ between the starting element and the destination element. These different CSS classes
+ * will be added/removed on the anchor element and a transition will be applied (the transition that is provided
+ * in the anchor class). Long story short, ngAnimate will figure out what classes to add and remove which will
+ * make the transition of the element as smooth and automatic as possible. Be sure to use simple CSS classes that
+ * do not rely on DOM nesting structure so that the anchor element appears the same as the starting element (since
+ * the cloned element is placed inside of root element which is likely close to the body element).
+ *
+ * Note that if the root element is on the `<html>` element then the cloned node will be placed inside of body.
+ *
+ *
+ * ## Using $animate in your directive code
+ *
+ * So far we've explored how to feed in animations into an Angular application, but how do we trigger animations within our own directives in our application?
+ * By injecting the `$animate` service into our directive code, we can trigger structural and class-based hooks which can then be consumed by animations. Let's
+ * imagine we have a greeting box that shows and hides itself when the data changes
+ *
+ * ```html
+ * <greeting-box active="onOrOff">Hi there</greeting-box>
+ * ```
+ *
+ * ```js
+ * ngModule.directive('greetingBox', ['$animate', function($animate) {
+ *   return function(scope, element, attrs) {
+ *     attrs.$observe('active', function(value) {
+ *       value ? $animate.addClass(element, 'on') : $animate.removeClass(element, 'on');
+ *     });
+ *   });
+ * }]);
+ * ```
+ *
+ * Now the `on` CSS class is added and removed on the greeting box component. Now if we add a CSS class on top of the greeting box element
+ * in our HTML code then we can trigger a CSS or JS animation to happen.
+ *
+ * ```css
+ * /&#42; normally we would create a CSS class to reference on the element &#42;/
+ * greeting-box.on { transition:0.5s linear all; background:green; color:white; }
+ * ```
+ *
+ * The `$animate` service contains a variety of other methods like `enter`, `leave`, `animate` and `setClass`. To learn more about what's
+ * possible be sure to visit the {@link ng.$animate $animate service API page}.
+ *
+ *
+ * ### Preventing Collisions With Third Party Libraries
+ *
+ * Some third-party frameworks place animation duration defaults across many element or className
+ * selectors in order to make their code small and reuseable. This can lead to issues with ngAnimate, which
+ * is expecting actual animations on these elements and has to wait for their completion.
+ *
+ * You can prevent this unwanted behavior by using a prefix on all your animation classes:
+ *
+ * ```css
+ * /&#42; prefixed with animate- &#42;/
+ * .animate-fade-add.animate-fade-add-active {
+ *   transition:1s linear all;
+ *   opacity:0;
+ * }
+ * ```
+ *
+ * You then configure `$animate` to enforce this prefix:
+ *
+ * ```js
+ * $animateProvider.classNameFilter(/animate-/);
+ * ```
+ *
+ * This also may provide your application with a speed boost since only specific elements containing CSS class prefix
+ * will be evaluated for animation when any DOM changes occur in the application.
+ *
+ * ## Callbacks and Promises
+ *
+ * When `$animate` is called it returns a promise that can be used to capture when the animation has ended. Therefore if we were to trigger
+ * an animation (within our directive code) then we can continue performing directive and scope related activities after the animation has
+ * ended by chaining onto the returned promise that animation method returns.
+ *
+ * ```js
+ * // somewhere within the depths of the directive
+ * $animate.enter(element, parent).then(function() {
+ *   //the animation has completed
+ * });
+ * ```
+ *
+ * (Note that earlier versions of Angular prior to v1.4 required the promise code to be wrapped using `$scope.$apply(...)`. This is not the case
+ * anymore.)
+ *
+ * In addition to the animation promise, we can also make use of animation-related callbacks within our directives and controller code by registering
+ * an event listener using the `$animate` service. Let's say for example that an animation was triggered on our view
+ * routing controller to hook into that:
+ *
+ * ```js
+ * ngModule.controller('HomePageController', ['$animate', function($animate) {
+ *   $animate.on('enter', ngViewElement, function(element) {
+ *     // the animation for this route has completed
+ *   }]);
+ * }])
+ * ```
+ *
+ * (Note that you will need to trigger a digest within the callback to get angular to notice any scope-related changes.)
+ */
+
+/**
+ * @ngdoc service
+ * @name $animate
+ * @kind object
+ *
+ * @description
+ * The ngAnimate `$animate` service documentation is the same for the core `$animate` service.
+ *
+ * Click here {@link ng.$animate $animate to learn more about animations with `$animate`}.
+ */
+angular.module('ngAnimate', [])
+  .provider('$$body', $$BodyProvider)
+
+  .directive('ngAnimateChildren', $$AnimateChildrenDirective)
+
+  .factory('$$rAFMutex', $$rAFMutexFactory)
+
+  .factory('$$AnimateRunner', $$AnimateRunnerFactory)
+
+  .provider('$$animateQueue', $$AnimateQueueProvider)
+  .provider('$$animation', $$AnimationProvider)
+
+  .provider('$animateCss', $AnimateCssProvider)
+  .provider('$$animateCssDriver', $$AnimateCssDriverProvider)
+
+  .provider('$$animateJs', $$AnimateJsProvider)
+  .provider('$$animateJsDriver', $$AnimateJsDriverProvider);
diff --git a/src/ngAnimate/shared.js b/src/ngAnimate/shared.js
new file mode 100644
index 000000000000..f0f353e83bb4
--- /dev/null
+++ b/src/ngAnimate/shared.js
@@ -0,0 +1,361 @@
+'use strict';
+
+/* jshint ignore:start */
+var noop        = angular.noop;
+var extend      = angular.extend;
+var jqLite      = angular.element;
+var forEach     = angular.forEach;
+var isArray     = angular.isArray;
+var isString    = angular.isString;
+var isObject    = angular.isObject;
+var isUndefined = angular.isUndefined;
+var isDefined   = angular.isDefined;
+var isFunction  = angular.isFunction;
+var isElement   = angular.isElement;
+
+var ELEMENT_NODE = 1;
+var COMMENT_NODE = 8;
+
+var ADD_CLASS_SUFFIX = '-add';
+var REMOVE_CLASS_SUFFIX = '-remove';
+var EVENT_CLASS_PREFIX = 'ng-';
+var ACTIVE_CLASS_SUFFIX = '-active';
+
+var NG_ANIMATE_CLASSNAME = 'ng-animate';
+var NG_ANIMATE_CHILDREN_DATA = '$$ngAnimateChildren';
+
+// Detect proper transitionend/animationend event names.
+var CSS_PREFIX = '', TRANSITION_PROP, TRANSITIONEND_EVENT, ANIMATION_PROP, ANIMATIONEND_EVENT;
+
+// If unprefixed events are not supported but webkit-prefixed are, use the latter.
+// Otherwise, just use W3C names, browsers not supporting them at all will just ignore them.
+// Note: Chrome implements `window.onwebkitanimationend` and doesn't implement `window.onanimationend`
+// but at the same time dispatches the `animationend` event and not `webkitAnimationEnd`.
+// Register both events in case `window.onanimationend` is not supported because of that,
+// do the same for `transitionend` as Safari is likely to exhibit similar behavior.
+// Also, the only modern browser that uses vendor prefixes for transitions/keyframes is webkit
+// therefore there is no reason to test anymore for other vendor prefixes:
+// http://caniuse.com/#search=transition
+if (window.ontransitionend === undefined && window.onwebkittransitionend !== undefined) {
+  CSS_PREFIX = '-webkit-';
+  TRANSITION_PROP = 'WebkitTransition';
+  TRANSITIONEND_EVENT = 'webkitTransitionEnd transitionend';
+} else {
+  TRANSITION_PROP = 'transition';
+  TRANSITIONEND_EVENT = 'transitionend';
+}
+
+if (window.onanimationend === undefined && window.onwebkitanimationend !== undefined) {
+  CSS_PREFIX = '-webkit-';
+  ANIMATION_PROP = 'WebkitAnimation';
+  ANIMATIONEND_EVENT = 'webkitAnimationEnd animationend';
+} else {
+  ANIMATION_PROP = 'animation';
+  ANIMATIONEND_EVENT = 'animationend';
+}
+
+var DURATION_KEY = 'Duration';
+var PROPERTY_KEY = 'Property';
+var DELAY_KEY = 'Delay';
+var TIMING_KEY = 'TimingFunction';
+var ANIMATION_ITERATION_COUNT_KEY = 'IterationCount';
+var ANIMATION_PLAYSTATE_KEY = 'PlayState';
+var SAFE_FAST_FORWARD_DURATION_VALUE = 9999;
+
+var ANIMATION_DELAY_PROP = ANIMATION_PROP + DELAY_KEY;
+var ANIMATION_DURATION_PROP = ANIMATION_PROP + DURATION_KEY;
+var TRANSITION_DELAY_PROP = TRANSITION_PROP + DELAY_KEY;
+var TRANSITION_DURATION_PROP = TRANSITION_PROP + DURATION_KEY;
+
+var isPromiseLike = function(p) {
+  return p && p.then ? true : false;
+};
+
+function assertArg(arg, name, reason) {
+  if (!arg) {
+    throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
+  }
+  return arg;
+}
+
+function mergeClasses(a,b) {
+  if (!a && !b) return '';
+  if (!a) return b;
+  if (!b) return a;
+  if (isArray(a)) a = a.join(' ');
+  if (isArray(b)) b = b.join(' ');
+  return a + ' ' + b;
+}
+
+function packageStyles(options) {
+  var styles = {};
+  if (options && (options.to || options.from)) {
+    styles.to = options.to;
+    styles.from = options.from;
+  }
+  return styles;
+}
+
+function pendClasses(classes, fix, isPrefix) {
+  var className = '';
+  classes = isArray(classes)
+      ? classes
+      : classes && isString(classes) && classes.length
+          ? classes.split(/\s+/)
+          : [];
+  forEach(classes, function(klass, i) {
+    if (klass && klass.length > 0) {
+      className += (i > 0) ? ' ' : '';
+      className += isPrefix ? fix + klass
+                            : klass + fix;
+    }
+  });
+  return className;
+}
+
+function removeFromArray(arr, val) {
+  var index = arr.indexOf(val);
+  if (val >= 0) {
+    arr.splice(index, 1);
+  }
+}
+
+function stripCommentsFromElement(element) {
+  if (element instanceof jqLite) {
+    switch (element.length) {
+      case 0:
+        return [];
+        break;
+
+      case 1:
+        // there is no point of stripping anything if the element
+        // is the only element within the jqLite wrapper.
+        // (it's important that we retain the element instance.)
+        if (element[0].nodeType === ELEMENT_NODE) {
+          return element;
+        }
+        break;
+
+      default:
+        return jqLite(extractElementNode(element));
+        break;
+    }
+  }
+
+  if (element.nodeType === ELEMENT_NODE) {
+    return jqLite(element);
+  }
+}
+
+function extractElementNode(element) {
+  if (!element[0]) return element;
+  for (var i = 0; i < element.length; i++) {
+    var elm = element[i];
+    if (elm.nodeType == ELEMENT_NODE) {
+      return elm;
+    }
+  }
+}
+
+function $$addClass($$jqLite, element, className) {
+  forEach(element, function(elm) {
+    $$jqLite.addClass(elm, className);
+  });
+}
+
+function $$removeClass($$jqLite, element, className) {
+  forEach(element, function(elm) {
+    $$jqLite.removeClass(elm, className);
+  });
+}
+
+function applyAnimationClassesFactory($$jqLite) {
+  return function(element, options) {
+    if (options.addClass) {
+      $$addClass($$jqLite, element, options.addClass);
+      options.addClass = null;
+    }
+    if (options.removeClass) {
+      $$removeClass($$jqLite, element, options.removeClass);
+      options.removeClass = null;
+    }
+  }
+}
+
+function prepareAnimationOptions(options) {
+  options = options || {};
+  if (!options.$$prepared) {
+    var domOperation = options.domOperation || noop;
+    options.domOperation = function() {
+      options.$$domOperationFired = true;
+      domOperation();
+      domOperation = noop;
+    };
+    options.$$prepared = true;
+  }
+  return options;
+}
+
+function applyAnimationStyles(element, options) {
+  applyAnimationFromStyles(element, options);
+  applyAnimationToStyles(element, options);
+}
+
+function applyAnimationFromStyles(element, options) {
+  if (options.from) {
+    element.css(options.from);
+    options.from = null;
+  }
+}
+
+function applyAnimationToStyles(element, options) {
+  if (options.to) {
+    element.css(options.to);
+    options.to = null;
+  }
+}
+
+function mergeAnimationOptions(element, target, newOptions) {
+  var toAdd = (target.addClass || '') + ' ' + (newOptions.addClass || '');
+  var toRemove = (target.removeClass || '') + ' ' + (newOptions.removeClass || '');
+  var classes = resolveElementClasses(element.attr('class'), toAdd, toRemove);
+
+  if (newOptions.preparationClasses) {
+    target.preparationClasses = concatWithSpace(newOptions.preparationClasses, target.preparationClasses);
+    delete newOptions.preparationClasses;
+  }
+
+  extend(target, newOptions);
+
+  if (classes.addClass) {
+    target.addClass = classes.addClass;
+  } else {
+    target.addClass = null;
+  }
+
+  if (classes.removeClass) {
+    target.removeClass = classes.removeClass;
+  } else {
+    target.removeClass = null;
+  }
+
+  return target;
+}
+
+function resolveElementClasses(existing, toAdd, toRemove) {
+  var ADD_CLASS = 1;
+  var REMOVE_CLASS = -1;
+
+  var flags = {};
+  existing = splitClassesToLookup(existing);
+
+  toAdd = splitClassesToLookup(toAdd);
+  forEach(toAdd, function(value, key) {
+    flags[key] = ADD_CLASS;
+  });
+
+  toRemove = splitClassesToLookup(toRemove);
+  forEach(toRemove, function(value, key) {
+    flags[key] = flags[key] === ADD_CLASS ? null : REMOVE_CLASS;
+  });
+
+  var classes = {
+    addClass: '',
+    removeClass: ''
+  };
+
+  forEach(flags, function(val, klass) {
+    var prop, allow;
+    if (val === ADD_CLASS) {
+      prop = 'addClass';
+      allow = !existing[klass];
+    } else if (val === REMOVE_CLASS) {
+      prop = 'removeClass';
+      allow = existing[klass];
+    }
+    if (allow) {
+      if (classes[prop].length) {
+        classes[prop] += ' ';
+      }
+      classes[prop] += klass;
+    }
+  });
+
+  function splitClassesToLookup(classes) {
+    if (isString(classes)) {
+      classes = classes.split(' ');
+    }
+
+    var obj = {};
+    forEach(classes, function(klass) {
+      // sometimes the split leaves empty string values
+      // incase extra spaces were applied to the options
+      if (klass.length) {
+        obj[klass] = true;
+      }
+    });
+    return obj;
+  }
+
+  return classes;
+}
+
+function getDomNode(element) {
+  return (element instanceof angular.element) ? element[0] : element;
+}
+
+function applyGeneratedPreparationClasses(element, event, options) {
+  var classes = '';
+  if (event) {
+    classes = pendClasses(event, EVENT_CLASS_PREFIX, true);
+  }
+  if (options.addClass) {
+    classes = concatWithSpace(classes, pendClasses(options.addClass, ADD_CLASS_SUFFIX));
+  }
+  if (options.removeClass) {
+    classes = concatWithSpace(classes, pendClasses(options.removeClass, REMOVE_CLASS_SUFFIX));
+  }
+  if (classes.length) {
+    options.preparationClasses = classes;
+    element.addClass(classes);
+  }
+}
+
+function clearGeneratedClasses(element, options) {
+  if (options.preparationClasses) {
+    element.removeClass(options.preparationClasses);
+    options.preparationClasses = null;
+  }
+  if (options.activeClasses) {
+    element.removeClass(options.activeClasses);
+    options.activeClasses = null;
+  }
+}
+
+function blockTransitions(node, duration) {
+  // we use a negative delay value since it performs blocking
+  // yet it doesn't kill any existing transitions running on the
+  // same element which makes this safe for class-based animations
+  var value = duration ? '-' + duration + 's' : '';
+  applyInlineStyle(node, [TRANSITION_DELAY_PROP, value]);
+  return [TRANSITION_DELAY_PROP, value];
+}
+
+function blockKeyframeAnimations(node, applyBlock) {
+  var value = applyBlock ? 'paused' : '';
+  var key = ANIMATION_PROP + ANIMATION_PLAYSTATE_KEY;
+  applyInlineStyle(node, [key, value]);
+  return [key, value];
+}
+
+function applyInlineStyle(node, styleTuple) {
+  var prop = styleTuple[0];
+  var value = styleTuple[1];
+  node.style[prop] = value;
+}
+
+function concatWithSpace(a,b) {
+  if (!a) return b;
+  if (!b) return a;
+  return a + ' ' + b;
+}
diff --git a/src/ngAria/aria.js b/src/ngAria/aria.js
index bfceebd59963..c1038f2f26c7 100644
--- a/src/ngAria/aria.js
+++ b/src/ngAria/aria.js
@@ -14,21 +14,21 @@
  *
  * ## Usage
  *
- * For ngAria to do its magic, simply include the module as a dependency. The directives supported
- * by ngAria are:
+ * For ngAria to do its magic, simply include the module `ngAria` as a dependency. The following
+ * directives are supported:
  * `ngModel`, `ngDisabled`, `ngShow`, `ngHide`, `ngClick`, `ngDblClick`, and `ngMessages`.
  *
  * Below is a more detailed breakdown of the attributes handled by ngAria:
  *
  * | Directive                                   | Supported Attributes                                                                   |
  * |---------------------------------------------|----------------------------------------------------------------------------------------|
- * | {@link ng.directive:ngModel ngModel}        | aria-checked, aria-valuemin, aria-valuemax, aria-valuenow, aria-invalid, aria-required |
  * | {@link ng.directive:ngDisabled ngDisabled}  | aria-disabled                                                                          |
  * | {@link ng.directive:ngShow ngShow}          | aria-hidden                                                                            |
  * | {@link ng.directive:ngHide ngHide}          | aria-hidden                                                                            |
- * | {@link ng.directive:ngClick ngClick}        | tabindex, keypress event                                                               |
  * | {@link ng.directive:ngDblclick ngDblclick}  | tabindex                                                                               |
  * | {@link module:ngMessages ngMessages}        | aria-live                                                                              |
+ * | {@link ng.directive:ngModel ngModel}        | aria-checked, aria-valuemin, aria-valuemax, aria-valuenow, aria-invalid, aria-required, input roles |
+ * | {@link ng.directive:ngClick ngClick}        | tabindex, keypress event, button role                                                               |
  *
  * Find out more information about each directive by reading the
  * {@link guide/accessibility ngAria Developer Guide}.
@@ -83,7 +83,8 @@ function $AriaProvider() {
     ariaMultiline: true,
     ariaValue: true,
     tabindex: true,
-    bindKeypress: true
+    bindKeypress: true,
+    bindRoleForClick: true
   };
 
   /**
@@ -102,6 +103,8 @@ function $AriaProvider() {
    *  - **tabindex** – `{boolean}` – Enables/disables tabindex tags
    *  - **bindKeypress** – `{boolean}` – Enables/disables keypress event binding on `&lt;div&gt;` and
    *    `&lt;li&gt;` elements with ng-click
+   *  - **bindRoleForClick** – `{boolean}` – Adds role=button to non-interactive elements like `div`
+   *    using ng-click, making them more accessible to users of assistive technologies
    *
    * @description
    * Enables/disables various ARIA attributes
@@ -115,9 +118,8 @@ function $AriaProvider() {
       var ariaCamelName = attr.$normalize(ariaAttr);
       if (config[ariaCamelName] && !attr[ariaCamelName]) {
         scope.$watch(attr[attrName], function(boolVal) {
-          if (negate) {
-            boolVal = !boolVal;
-          }
+          // ensure boolean value
+          boolVal = negate ? !boolVal : !!boolVal;
           elem.attr(ariaAttr, boolVal);
         });
       }
@@ -193,6 +195,10 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
     return $aria.config(normalizedAttr) && !elem.attr(attr);
   }
 
+  function shouldAttachRole(role, elem) {
+    return !elem.attr('role') && (elem.attr('type') === role) && (elem[0].nodeName !== 'INPUT');
+  }
+
   function getShape(attr, elem) {
     var type = attr.type,
         role = attr.role;
@@ -207,82 +213,111 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
     restrict: 'A',
     require: '?ngModel',
     priority: 200, //Make sure watches are fired after any other directives that affect the ngModel value
-    link: function(scope, elem, attr, ngModel) {
+    compile: function(elem, attr) {
       var shape = getShape(attr, elem);
-      var needsTabIndex = shouldAttachAttr('tabindex', 'tabindex', elem);
-
-      function ngAriaWatchModelValue() {
-        return ngModel.$modelValue;
-      }
-
-      function getRadioReaction() {
-        if (needsTabIndex) {
-          needsTabIndex = false;
-          return function ngAriaRadioReaction(newVal) {
-            var boolVal = (attr.value == ngModel.$viewValue);
-            elem.attr('aria-checked', boolVal);
-            elem.attr('tabindex', 0 - !boolVal);
-          };
-        } else {
-          return function ngAriaRadioReaction(newVal) {
-            elem.attr('aria-checked', (attr.value == ngModel.$viewValue));
-          };
-        }
-      }
 
-      function ngAriaCheckboxReaction(newVal) {
-        elem.attr('aria-checked', !ngModel.$isEmpty(ngModel.$viewValue));
-      }
+      return {
+        pre: function(scope, elem, attr, ngModel) {
+          if (shape === 'checkbox' && attr.type !== 'checkbox') {
+            //Use the input[checkbox] $isEmpty implementation for elements with checkbox roles
+            ngModel.$isEmpty = function(value) {
+              return value === false;
+            };
+          }
+        },
+        post: function(scope, elem, attr, ngModel) {
+          var needsTabIndex = shouldAttachAttr('tabindex', 'tabindex', elem);
 
-      switch (shape) {
-        case 'radio':
-        case 'checkbox':
-          if (shouldAttachAttr('aria-checked', 'ariaChecked', elem)) {
-            scope.$watch(ngAriaWatchModelValue, shape === 'radio' ?
-                getRadioReaction() : ngAriaCheckboxReaction);
+          function ngAriaWatchModelValue() {
+            return ngModel.$modelValue;
           }
-          break;
-        case 'range':
-          if ($aria.config('ariaValue')) {
-            if (attr.min && !elem.attr('aria-valuemin')) {
-              elem.attr('aria-valuemin', attr.min);
-            }
-            if (attr.max && !elem.attr('aria-valuemax')) {
-              elem.attr('aria-valuemax', attr.max);
-            }
-            if (!elem.attr('aria-valuenow')) {
-              scope.$watch(ngAriaWatchModelValue, function ngAriaValueNowReaction(newVal) {
-                elem.attr('aria-valuenow', newVal);
-              });
+
+          function getRadioReaction() {
+            if (needsTabIndex) {
+              needsTabIndex = false;
+              return function ngAriaRadioReaction(newVal) {
+                var boolVal = (attr.value == ngModel.$viewValue);
+                elem.attr('aria-checked', boolVal);
+                elem.attr('tabindex', 0 - !boolVal);
+              };
+            } else {
+              return function ngAriaRadioReaction(newVal) {
+                elem.attr('aria-checked', (attr.value == ngModel.$viewValue));
+              };
             }
           }
-          break;
-        case 'multiline':
-          if (shouldAttachAttr('aria-multiline', 'ariaMultiline', elem)) {
-            elem.attr('aria-multiline', true);
+
+          function ngAriaCheckboxReaction() {
+            elem.attr('aria-checked', !ngModel.$isEmpty(ngModel.$viewValue));
           }
-          break;
-      }
 
-      if (needsTabIndex) {
-        elem.attr('tabindex', 0);
-      }
+          switch (shape) {
+            case 'radio':
+            case 'checkbox':
+              if (shouldAttachRole(shape, elem)) {
+                elem.attr('role', shape);
+              }
+              if (shouldAttachAttr('aria-checked', 'ariaChecked', elem)) {
+                scope.$watch(ngAriaWatchModelValue, shape === 'radio' ?
+                    getRadioReaction() : ngAriaCheckboxReaction);
+              }
+              break;
+            case 'range':
+              if (shouldAttachRole(shape, elem)) {
+                elem.attr('role', 'slider');
+              }
+              if ($aria.config('ariaValue')) {
+                var needsAriaValuemin = !elem.attr('aria-valuemin') &&
+                    (attr.hasOwnProperty('min') || attr.hasOwnProperty('ngMin'));
+                var needsAriaValuemax = !elem.attr('aria-valuemax') &&
+                    (attr.hasOwnProperty('max') || attr.hasOwnProperty('ngMax'));
+                var needsAriaValuenow = !elem.attr('aria-valuenow');
 
-      if (ngModel.$validators.required && shouldAttachAttr('aria-required', 'ariaRequired', elem)) {
-        scope.$watch(function ngAriaRequiredWatch() {
-          return ngModel.$error.required;
-        }, function ngAriaRequiredReaction(newVal) {
-          elem.attr('aria-required', !!newVal);
-        });
-      }
+                if (needsAriaValuemin) {
+                  attr.$observe('min', function ngAriaValueMinReaction(newVal) {
+                    elem.attr('aria-valuemin', newVal);
+                  });
+                }
+                if (needsAriaValuemax) {
+                  attr.$observe('max', function ngAriaValueMinReaction(newVal) {
+                    elem.attr('aria-valuemax', newVal);
+                  });
+                }
+                if (needsAriaValuenow) {
+                  scope.$watch(ngAriaWatchModelValue, function ngAriaValueNowReaction(newVal) {
+                    elem.attr('aria-valuenow', newVal);
+                  });
+                }
+              }
+              break;
+            case 'multiline':
+              if (shouldAttachAttr('aria-multiline', 'ariaMultiline', elem)) {
+                elem.attr('aria-multiline', true);
+              }
+              break;
+          }
 
-      if (shouldAttachAttr('aria-invalid', 'ariaInvalid', elem)) {
-        scope.$watch(function ngAriaInvalidWatch() {
-          return ngModel.$invalid;
-        }, function ngAriaInvalidReaction(newVal) {
-          elem.attr('aria-invalid', !!newVal);
-        });
-      }
+          if (needsTabIndex) {
+            elem.attr('tabindex', 0);
+          }
+
+          if (ngModel.$validators.required && shouldAttachAttr('aria-required', 'ariaRequired', elem)) {
+            scope.$watch(function ngAriaRequiredWatch() {
+              return ngModel.$error.required;
+            }, function ngAriaRequiredReaction(newVal) {
+              elem.attr('aria-required', !!newVal);
+            });
+          }
+
+          if (shouldAttachAttr('aria-invalid', 'ariaInvalid', elem)) {
+            scope.$watch(function ngAriaInvalidWatch() {
+              return ngModel.$invalid;
+            }, function ngAriaInvalidReaction(newVal) {
+              elem.attr('aria-invalid', !!newVal);
+            });
+          }
+        }
+      };
     }
   };
 }])
@@ -307,19 +342,28 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
       var fn = $parse(attr.ngClick, /* interceptorFn */ null, /* expensiveChecks */ true);
       return function(scope, elem, attr) {
 
+        var nodeBlackList = ['BUTTON', 'A', 'INPUT', 'TEXTAREA'];
+
         function isNodeOneOf(elem, nodeTypeArray) {
           if (nodeTypeArray.indexOf(elem[0].nodeName) !== -1) {
             return true;
           }
         }
 
+        if ($aria.config('bindRoleForClick')
+            && !elem.attr('role')
+              && !isNodeOneOf(elem, nodeBlackList)) {
+          elem.attr('role', 'button');
+        }
+
         if ($aria.config('tabindex') && !elem.attr('tabindex')) {
           elem.attr('tabindex', 0);
         }
 
-        if ($aria.config('bindKeypress') && !attr.ngKeypress && isNodeOneOf(elem, ['DIV', 'LI'])) {
+        if ($aria.config('bindKeypress') && !attr.ngKeypress && !isNodeOneOf(elem, nodeBlackList)) {
           elem.on('keypress', function(event) {
-            if (event.keyCode === 32 || event.keyCode === 13) {
+            var keyCode = event.which || event.keyCode;
+            if (keyCode === 32 || keyCode === 13) {
               scope.$apply(callback);
             }
 
diff --git a/src/ngCookies/cookieStore.js b/src/ngCookies/cookieStore.js
new file mode 100644
index 000000000000..c1f922cfc302
--- /dev/null
+++ b/src/ngCookies/cookieStore.js
@@ -0,0 +1,81 @@
+'use strict';
+
+angular.module('ngCookies').
+/**
+ * @ngdoc service
+ * @name $cookieStore
+ * @deprecated
+ * @requires $cookies
+ *
+ * @description
+ * Provides a key-value (string-object) storage, that is backed by session cookies.
+ * Objects put or retrieved from this storage are automatically serialized or
+ * deserialized by angular's toJson/fromJson.
+ *
+ * Requires the {@link ngCookies `ngCookies`} module to be installed.
+ *
+ * <div class="alert alert-danger">
+ * **Note:** The $cookieStore service is **deprecated**.
+ * Please use the {@link ngCookies.$cookies `$cookies`} service instead.
+ * </div>
+ *
+ * @example
+ *
+ * ```js
+ * angular.module('cookieStoreExample', ['ngCookies'])
+ *   .controller('ExampleController', ['$cookieStore', function($cookieStore) {
+ *     // Put cookie
+ *     $cookieStore.put('myFavorite','oatmeal');
+ *     // Get cookie
+ *     var favoriteCookie = $cookieStore.get('myFavorite');
+ *     // Removing a cookie
+ *     $cookieStore.remove('myFavorite');
+ *   }]);
+ * ```
+ */
+ factory('$cookieStore', ['$cookies', function($cookies) {
+
+    return {
+      /**
+       * @ngdoc method
+       * @name $cookieStore#get
+       *
+       * @description
+       * Returns the value of given cookie key
+       *
+       * @param {string} key Id to use for lookup.
+       * @returns {Object} Deserialized cookie value, undefined if the cookie does not exist.
+       */
+      get: function(key) {
+        return $cookies.getObject(key);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $cookieStore#put
+       *
+       * @description
+       * Sets a value for given cookie key
+       *
+       * @param {string} key Id for the `value`.
+       * @param {Object} value Value to be stored.
+       */
+      put: function(key, value) {
+        $cookies.putObject(key, value);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $cookieStore#remove
+       *
+       * @description
+       * Remove given cookie
+       *
+       * @param {string} key Id of the key-value pair to delete.
+       */
+      remove: function(key) {
+        $cookies.remove(key);
+      }
+    };
+
+  }]);
diff --git a/src/ngCookies/cookieWriter.js b/src/ngCookies/cookieWriter.js
new file mode 100644
index 000000000000..b4f496f825bb
--- /dev/null
+++ b/src/ngCookies/cookieWriter.js
@@ -0,0 +1,60 @@
+'use strict';
+
+/**
+ * @name $$cookieWriter
+ * @requires $document
+ *
+ * @description
+ * This is a private service for writing cookies
+ *
+ * @param {string} name Cookie name
+ * @param {string=} value Cookie value (if undefined, cookie will be deleted)
+ * @param {Object=} options Object with options that need to be stored for the cookie.
+ */
+function $$CookieWriter($document, $log, $browser) {
+  var cookiePath = $browser.baseHref();
+  var rawDocument = $document[0];
+
+  function buildCookieString(name, value, options) {
+    var path, expires;
+    options = options || {};
+    expires = options.expires;
+    path = angular.isDefined(options.path) ? options.path : cookiePath;
+    if (value === undefined) {
+      expires = 'Thu, 01 Jan 1970 00:00:00 GMT';
+      value = '';
+    }
+    if (angular.isString(expires)) {
+      expires = new Date(expires);
+    }
+
+    var str = encodeURIComponent(name) + '=' + encodeURIComponent(value);
+    str += path ? ';path=' + path : '';
+    str += options.domain ? ';domain=' + options.domain : '';
+    str += expires ? ';expires=' + expires.toUTCString() : '';
+    str += options.secure ? ';secure' : '';
+
+    // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
+    // - 300 cookies
+    // - 20 cookies per unique domain
+    // - 4096 bytes per cookie
+    var cookieLength = str.length + 1;
+    if (cookieLength > 4096) {
+      $log.warn("Cookie '" + name +
+        "' possibly not set or overflowed because it was too large (" +
+        cookieLength + " > 4096 bytes)!");
+    }
+
+    return str;
+  }
+
+  return function(name, value, options) {
+    rawDocument.cookie = buildCookieString(name, value, options);
+  };
+}
+
+$$CookieWriter.$inject = ['$document', '$log', '$browser'];
+
+angular.module('ngCookies').provider('$$cookieWriter', function $$CookieWriterProvider() {
+  this.$get = $$CookieWriter;
+});
diff --git a/src/ngCookies/cookies.js b/src/ngCookies/cookies.js
index fcb66e62d16a..5bcf39bfeb76 100644
--- a/src/ngCookies/cookies.js
+++ b/src/ngCookies/cookies.js
@@ -12,187 +12,163 @@
  *
  * <div doc-module-components="ngCookies"></div>
  *
- * See {@link ngCookies.$cookies `$cookies`} and
- * {@link ngCookies.$cookieStore `$cookieStore`} for usage.
+ * See {@link ngCookies.$cookies `$cookies`} for usage.
  */
 
 
 angular.module('ngCookies', ['ng']).
   /**
-   * @ngdoc service
-   * @name $cookies
-   *
+   * @ngdoc provider
+   * @name $cookiesProvider
    * @description
-   * Provides read/write access to browser's cookies.
-   *
-   * Only a simple Object is exposed and by adding or removing properties to/from this object, new
-   * cookies are created/deleted at the end of current $eval.
-   * The object's properties can only be strings.
-   *
-   * Requires the {@link ngCookies `ngCookies`} module to be installed.
-   *
-   * @example
-   *
-   * ```js
-   * angular.module('cookiesExample', ['ngCookies'])
-   *   .controller('ExampleController', ['$cookies', function($cookies) {
-   *     // Retrieving a cookie
-   *     var favoriteCookie = $cookies.myFavorite;
-   *     // Setting a cookie
-   *     $cookies.myFavorite = 'oatmeal';
-   *   }]);
-   * ```
-   */
-   factory('$cookies', ['$rootScope', '$browser', function($rootScope, $browser) {
-      var cookies = {},
-          lastCookies = {},
-          lastBrowserCookies,
-          runEval = false,
-          copy = angular.copy,
-          isUndefined = angular.isUndefined;
-
-      //creates a poller fn that copies all cookies from the $browser to service & inits the service
-      $browser.addPollFn(function() {
-        var currentCookies = $browser.cookies();
-        if (lastBrowserCookies != currentCookies) { //relies on browser.cookies() impl
-          lastBrowserCookies = currentCookies;
-          copy(currentCookies, lastCookies);
-          copy(currentCookies, cookies);
-          if (runEval) $rootScope.$apply();
-        }
-      })();
-
-      runEval = true;
-
-      //at the end of each eval, push cookies
-      //TODO: this should happen before the "delayed" watches fire, because if some cookies are not
-      //      strings or browser refuses to store some cookies, we update the model in the push fn.
-      $rootScope.$watch(push);
-
-      return cookies;
-
-
-      /**
-       * Pushes all the cookies from the service to the browser and verifies if all cookies were
-       * stored.
-       */
-      function push() {
-        var name,
-            value,
-            browserCookies,
-            updated;
-
-        //delete any cookies deleted in $cookies
-        for (name in lastCookies) {
-          if (isUndefined(cookies[name])) {
-            $browser.cookies(name, undefined);
-          }
-        }
-
-        //update all cookies updated in $cookies
-        for (name in cookies) {
-          value = cookies[name];
-          if (!angular.isString(value)) {
-            value = '' + value;
-            cookies[name] = value;
-          }
-          if (value !== lastCookies[name]) {
-            $browser.cookies(name, value);
-            updated = true;
-          }
-        }
-
-        //verify what was actually stored
-        if (updated) {
-          updated = false;
-          browserCookies = $browser.cookies();
-
-          for (name in cookies) {
-            if (cookies[name] !== browserCookies[name]) {
-              //delete or reset all cookies that the browser dropped from $cookies
-              if (isUndefined(browserCookies[name])) {
-                delete cookies[name];
-              } else {
-                cookies[name] = browserCookies[name];
-              }
-              updated = true;
-            }
-          }
-        }
-      }
-    }]).
-
-
-  /**
-   * @ngdoc service
-   * @name $cookieStore
-   * @requires $cookies
-   *
-   * @description
-   * Provides a key-value (string-object) storage, that is backed by session cookies.
-   * Objects put or retrieved from this storage are automatically serialized or
-   * deserialized by angular's toJson/fromJson.
-   *
-   * Requires the {@link ngCookies `ngCookies`} module to be installed.
-   *
-   * @example
-   *
-   * ```js
-   * angular.module('cookieStoreExample', ['ngCookies'])
-   *   .controller('ExampleController', ['$cookieStore', function($cookieStore) {
-   *     // Put cookie
-   *     $cookieStore.put('myFavorite','oatmeal');
-   *     // Get cookie
-   *     var favoriteCookie = $cookieStore.get('myFavorite');
-   *     // Removing a cookie
-   *     $cookieStore.remove('myFavorite');
-   *   }]);
-   * ```
-   */
-   factory('$cookieStore', ['$cookies', function($cookies) {
-
+   * Use `$cookiesProvider` to change the default behavior of the {@link ngCookies.$cookies $cookies} service.
+   * */
+   provider('$cookies', [function $CookiesProvider() {
+    /**
+     * @ngdoc property
+     * @name $cookiesProvider#defaults
+     * @description
+     *
+     * Object containing default options to pass when setting cookies.
+     *
+     * The object may have following properties:
+     *
+     * - **path** - `{string}` - The cookie will be available only for this path and its
+     *   sub-paths. By default, this would be the URL that appears in your base tag.
+     * - **domain** - `{string}` - The cookie will be available only for this domain and
+     *   its sub-domains. For obvious security reasons the user agent will not accept the
+     *   cookie if the current domain is not a sub domain or equals to the requested domain.
+     * - **expires** - `{string|Date}` - String of the form "Wdy, DD Mon YYYY HH:MM:SS GMT"
+     *   or a Date object indicating the exact date/time this cookie will expire.
+     * - **secure** - `{boolean}` - The cookie will be available only in secured connection.
+     *
+     * Note: by default the address that appears in your `<base>` tag will be used as path.
+     * This is important so that cookies will be visible for all routes in case html5mode is enabled
+     *
+     **/
+    var defaults = this.defaults = {};
+
+    function calcOptions(options) {
+      return options ? angular.extend({}, defaults, options) : defaults;
+    }
+
+    /**
+     * @ngdoc service
+     * @name $cookies
+     *
+     * @description
+     * Provides read/write access to browser's cookies.
+     *
+     * <div class="alert alert-info">
+     * Up until Angular 1.3, `$cookies` exposed properties that represented the
+     * current browser cookie values. In version 1.4, this behavior has changed, and
+     * `$cookies` now provides a standard api of getters, setters etc.
+     * </div>
+     *
+     * Requires the {@link ngCookies `ngCookies`} module to be installed.
+     *
+     * @example
+     *
+     * ```js
+     * angular.module('cookiesExample', ['ngCookies'])
+     *   .controller('ExampleController', ['$cookies', function($cookies) {
+     *     // Retrieving a cookie
+     *     var favoriteCookie = $cookies.get('myFavorite');
+     *     // Setting a cookie
+     *     $cookies.put('myFavorite', 'oatmeal');
+     *   }]);
+     * ```
+     */
+    this.$get = ['$$cookieReader', '$$cookieWriter', function($$cookieReader, $$cookieWriter) {
       return {
         /**
          * @ngdoc method
-         * @name $cookieStore#get
+         * @name $cookies#get
          *
          * @description
          * Returns the value of given cookie key
          *
          * @param {string} key Id to use for lookup.
-         * @returns {Object} Deserialized cookie value, undefined if the cookie does not exist.
+         * @returns {string} Raw cookie value.
          */
         get: function(key) {
-          var value = $cookies[key];
+          return $$cookieReader()[key];
+        },
+
+        /**
+         * @ngdoc method
+         * @name $cookies#getObject
+         *
+         * @description
+         * Returns the deserialized value of given cookie key
+         *
+         * @param {string} key Id to use for lookup.
+         * @returns {Object} Deserialized cookie value.
+         */
+        getObject: function(key) {
+          var value = this.get(key);
           return value ? angular.fromJson(value) : value;
         },
 
         /**
          * @ngdoc method
-         * @name $cookieStore#put
+         * @name $cookies#getAll
+         *
+         * @description
+         * Returns a key value object with all the cookies
+         *
+         * @returns {Object} All cookies
+         */
+        getAll: function() {
+          return $$cookieReader();
+        },
+
+        /**
+         * @ngdoc method
+         * @name $cookies#put
          *
          * @description
          * Sets a value for given cookie key
          *
          * @param {string} key Id for the `value`.
+         * @param {string} value Raw value to be stored.
+         * @param {Object=} options Options object.
+         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
+         */
+        put: function(key, value, options) {
+          $$cookieWriter(key, value, calcOptions(options));
+        },
+
+        /**
+         * @ngdoc method
+         * @name $cookies#putObject
+         *
+         * @description
+         * Serializes and sets a value for given cookie key
+         *
+         * @param {string} key Id for the `value`.
          * @param {Object} value Value to be stored.
+         * @param {Object=} options Options object.
+         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
          */
-        put: function(key, value) {
-          $cookies[key] = angular.toJson(value);
+        putObject: function(key, value, options) {
+          this.put(key, angular.toJson(value), options);
         },
 
         /**
          * @ngdoc method
-         * @name $cookieStore#remove
+         * @name $cookies#remove
          *
          * @description
          * Remove given cookie
          *
          * @param {string} key Id of the key-value pair to delete.
+         * @param {Object=} options Options object.
+         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
          */
-        remove: function(key) {
-          delete $cookies[key];
+        remove: function(key, options) {
+          $$cookieWriter(key, undefined, calcOptions(options));
         }
       };
-
-    }]);
+    }];
+  }]);
diff --git a/src/ngLocale/angular-locale_aa-dj.js b/src/ngLocale/angular-locale_aa-dj.js
index cc2e78a926c6..2fe0c3034d79 100644
--- a/src/ngLocale/angular-locale_aa-dj.js
+++ b/src/ngLocale/angular-locale_aa-dj.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Gumqata",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "Qunxa Garablu",
       "Kudo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Xim",
       "Kax"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_aa-er.js b/src/ngLocale/angular-locale_aa-er.js
index 4470781aa948..48c1e7c3999e 100644
--- a/src/ngLocale/angular-locale_aa-er.js
+++ b/src/ngLocale/angular-locale_aa-er.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Gumqata",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Qunxa Garablu",
       "Kudo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Xim",
       "Kax"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_aa-et.js b/src/ngLocale/angular-locale_aa-et.js
index 4992ee81d757..03b62551e93a 100644
--- a/src/ngLocale/angular-locale_aa-et.js
+++ b/src/ngLocale/angular-locale_aa-et.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Gumqata",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Qunxa Garablu",
       "Kudo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Xim",
       "Kax"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_aa.js b/src/ngLocale/angular-locale_aa.js
index 6a9c801b7adf..661fa2e1dfe1 100644
--- a/src/ngLocale/angular-locale_aa.js
+++ b/src/ngLocale/angular-locale_aa.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Gumqata",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Qunxa Garablu",
       "Kudo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Xim",
       "Kax"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_af-na.js b/src/ngLocale/angular-locale_af-na.js
index 8d79b1f994e1..4647a92bce44 100644
--- a/src/ngLocale/angular-locale_af-na.js
+++ b/src/ngLocale/angular-locale_af-na.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Vrydag",
       "Saterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.C.",
+      "n.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januarie",
       "Februarie",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,9 +97,9 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4",
         "negSuf": "",
-        "posPre": "\u00a4\u00a0",
+        "posPre": "\u00a4",
         "posSuf": ""
       }
     ]
diff --git a/src/ngLocale/angular-locale_af-za.js b/src/ngLocale/angular-locale_af-za.js
index 639649396b14..38c2217c90f1 100644
--- a/src/ngLocale/angular-locale_af-za.js
+++ b/src/ngLocale/angular-locale_af-za.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Vrydag",
       "Saterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.C.",
+      "n.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januarie",
       "Februarie",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "dd MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_af.js b/src/ngLocale/angular-locale_af.js
index 7a2d41d317d9..9ed43d14fe6b 100644
--- a/src/ngLocale/angular-locale_af.js
+++ b/src/ngLocale/angular-locale_af.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Vrydag",
       "Saterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.C.",
+      "n.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januarie",
       "Februarie",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "dd MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_agq-cm.js b/src/ngLocale/angular-locale_agq-cm.js
index 94ee8a6a832c..9d3f9e9cdd81 100644
--- a/src/ngLocale/angular-locale_agq-cm.js
+++ b/src/ngLocale/angular-locale_agq-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "tsu\u0294ugh\u0268\u0302m",
       "tsu\u0294ndz\u0268k\u0254\u0294\u0254"
     ],
+    "ERANAMES": [
+      "S\u011be K\u0268\u0300lesto",
+      "B\u01cea K\u0268\u0300lesto"
+    ],
+    "ERAS": [
+      "SK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ndz\u0254\u0300\u014b\u0254\u0300n\u00f9m",
       "ndz\u0254\u0300\u014b\u0254\u0300k\u0197\u0300z\u00f9\u0294",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "kaa",
       "fwo"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_agq.js b/src/ngLocale/angular-locale_agq.js
index 48b8e696555b..2bd28260de13 100644
--- a/src/ngLocale/angular-locale_agq.js
+++ b/src/ngLocale/angular-locale_agq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "tsu\u0294ugh\u0268\u0302m",
       "tsu\u0294ndz\u0268k\u0254\u0294\u0254"
     ],
+    "ERANAMES": [
+      "S\u011be K\u0268\u0300lesto",
+      "B\u01cea K\u0268\u0300lesto"
+    ],
+    "ERAS": [
+      "SK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ndz\u0254\u0300\u014b\u0254\u0300n\u00f9m",
       "ndz\u0254\u0300\u014b\u0254\u0300k\u0197\u0300z\u00f9\u0294",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "kaa",
       "fwo"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ak-gh.js b/src/ngLocale/angular-locale_ak-gh.js
index bc1f955f0a6d..8407b96f03d9 100644
--- a/src/ngLocale/angular-locale_ak-gh.js
+++ b/src/ngLocale/angular-locale_ak-gh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Fida",
       "Memeneda"
     ],
+    "ERANAMES": [
+      "Ansa Kristo",
+      "Kristo Ekyiri"
+    ],
+    "ERAS": [
+      "AK",
+      "KE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Sanda-\u0186p\u025bp\u0254n",
       "Kwakwar-\u0186gyefuo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0186-O",
       "M-\u0186"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ak.js b/src/ngLocale/angular-locale_ak.js
index 78aece39f447..9117b35478c2 100644
--- a/src/ngLocale/angular-locale_ak.js
+++ b/src/ngLocale/angular-locale_ak.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Fida",
       "Memeneda"
     ],
+    "ERANAMES": [
+      "Ansa Kristo",
+      "Kristo Ekyiri"
+    ],
+    "ERAS": [
+      "AK",
+      "KE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Sanda-\u0186p\u025bp\u0254n",
       "Kwakwar-\u0186gyefuo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0186-O",
       "M-\u0186"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_am-et.js b/src/ngLocale/angular-locale_am-et.js
index 646419785b70..77b38ff85c34 100644
--- a/src/ngLocale/angular-locale_am-et.js
+++ b/src/ngLocale/angular-locale_am-et.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u12d3\u122d\u1265",
       "\u1245\u12f3\u121c"
     ],
+    "ERANAMES": [
+      "\u12d3\u1218\u1270 \u12d3\u1208\u121d",
+      "\u12d3\u1218\u1270 \u121d\u1215\u1228\u1275"
+    ],
+    "ERAS": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u1303\u1295\u12e9\u12c8\u122a",
       "\u134c\u1265\u1229\u12c8\u122a",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u1296\u126c\u121d",
       "\u12f2\u1234\u121d"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_am.js b/src/ngLocale/angular-locale_am.js
index f52737bfe05f..03146492613b 100644
--- a/src/ngLocale/angular-locale_am.js
+++ b/src/ngLocale/angular-locale_am.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u12d3\u122d\u1265",
       "\u1245\u12f3\u121c"
     ],
+    "ERANAMES": [
+      "\u12d3\u1218\u1270 \u12d3\u1208\u121d",
+      "\u12d3\u1218\u1270 \u121d\u1215\u1228\u1275"
+    ],
+    "ERAS": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u1303\u1295\u12e9\u12c8\u122a",
       "\u134c\u1265\u1229\u12c8\u122a",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u1296\u126c\u121d",
       "\u12f2\u1234\u121d"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-001.js b/src/ngLocale/angular-locale_ar-001.js
index 349f006e72e8..a9a7875acfc7 100644
--- a/src/ngLocale/angular-locale_ar-001.js
+++ b/src/ngLocale/angular-locale_ar-001.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-ae.js b/src/ngLocale/angular-locale_ar-ae.js
index d12cc710bca6..6b335da1fca6 100644
--- a/src/ngLocale/angular-locale_ar-ae.js
+++ b/src/ngLocale/angular-locale_ar-ae.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-bh.js b/src/ngLocale/angular-locale_ar-bh.js
index ae6200103005..361f8ab9ae2b 100644
--- a/src/ngLocale/angular-locale_ar-bh.js
+++ b/src/ngLocale/angular-locale_ar-bh.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-dj.js b/src/ngLocale/angular-locale_ar-dj.js
index 2b5138b3b3c6..d44bbce005f3 100644
--- a/src/ngLocale/angular-locale_ar-dj.js
+++ b/src/ngLocale/angular-locale_ar-dj.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-dz.js b/src/ngLocale/angular-locale_ar-dz.js
index d7403771aabc..871d2ce49f87 100644
--- a/src/ngLocale/angular-locale_ar-dz.js
+++ b/src/ngLocale/angular-locale_ar-dz.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u062c\u0627\u0646\u0641\u064a",
       "\u0641\u064a\u0641\u0631\u064a",
@@ -53,13 +62,17 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
-    "medium": "y/MM/dd h:mm:ss a",
-    "mediumDate": "y/MM/dd",
+    "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
+    "mediumDate": "dd\u200f/MM\u200f/y",
     "mediumTime": "h:mm:ss a",
-    "short": "y/M/d h:mm a",
-    "shortDate": "y/M/d",
+    "short": "d\u200f/M\u200f/y h:mm a",
+    "shortDate": "d\u200f/M\u200f/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-eg.js b/src/ngLocale/angular-locale_ar-eg.js
index c6eb0a1bb861..734c629af2ee 100644
--- a/src/ngLocale/angular-locale_ar-eg.js
+++ b/src/ngLocale/angular-locale_ar-eg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-eh.js b/src/ngLocale/angular-locale_ar-eh.js
index dff381bc51b7..f9c2666aac0d 100644
--- a/src/ngLocale/angular-locale_ar-eh.js
+++ b/src/ngLocale/angular-locale_ar-eh.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-er.js b/src/ngLocale/angular-locale_ar-er.js
index baa254c91c23..0510d70bb609 100644
--- a/src/ngLocale/angular-locale_ar-er.js
+++ b/src/ngLocale/angular-locale_ar-er.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-il.js b/src/ngLocale/angular-locale_ar-il.js
index 9cdb3ef59442..ea6e8932206e 100644
--- a/src/ngLocale/angular-locale_ar-il.js
+++ b/src/ngLocale/angular-locale_ar-il.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-iq.js b/src/ngLocale/angular-locale_ar-iq.js
index 69afabd1363b..9f08ac2f148f 100644
--- a/src/ngLocale/angular-locale_ar-iq.js
+++ b/src/ngLocale/angular-locale_ar-iq.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0634\u0628\u0627\u0637",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-jo.js b/src/ngLocale/angular-locale_ar-jo.js
index ae407c3abb72..793b353446d6 100644
--- a/src/ngLocale/angular-locale_ar-jo.js
+++ b/src/ngLocale/angular-locale_ar-jo.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0634\u0628\u0627\u0637",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-km.js b/src/ngLocale/angular-locale_ar-km.js
index 62c3b3885b1d..6f9031decc57 100644
--- a/src/ngLocale/angular-locale_ar-km.js
+++ b/src/ngLocale/angular-locale_ar-km.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-kw.js b/src/ngLocale/angular-locale_ar-kw.js
index bb7034b85c54..b0b55a7b8b8b 100644
--- a/src/ngLocale/angular-locale_ar-kw.js
+++ b/src/ngLocale/angular-locale_ar-kw.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-lb.js b/src/ngLocale/angular-locale_ar-lb.js
index 578331eadc0d..b2eb263a2bef 100644
--- a/src/ngLocale/angular-locale_ar-lb.js
+++ b/src/ngLocale/angular-locale_ar-lb.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0634\u0628\u0627\u0637",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
+    "mediumDate": "dd\u200f/MM\u200f/y",
     "mediumTime": "h:mm:ss a",
     "short": "d\u200f/M\u200f/y h:mm a",
     "shortDate": "d\u200f/M\u200f/y",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-ly.js b/src/ngLocale/angular-locale_ar-ly.js
index 03bbb2d20786..0a9dbf620333 100644
--- a/src/ngLocale/angular-locale_ar-ly.js
+++ b/src/ngLocale/angular-locale_ar-ly.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-ma.js b/src/ngLocale/angular-locale_ar-ma.js
index 69fb31909d4a..589e258a8765 100644
--- a/src/ngLocale/angular-locale_ar-ma.js
+++ b/src/ngLocale/angular-locale_ar-ma.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,13 +62,17 @@ $provide.value("$locale", {
       "\u0646\u0648\u0646\u0628\u0631",
       "\u062f\u062c\u0646\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
-    "medium": "y/MM/dd h:mm:ss a",
-    "mediumDate": "y/MM/dd",
+    "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
+    "mediumDate": "dd\u200f/MM\u200f/y",
     "mediumTime": "h:mm:ss a",
-    "short": "y/M/d h:mm a",
-    "shortDate": "y/M/d",
+    "short": "d\u200f/M\u200f/y h:mm a",
+    "shortDate": "d\u200f/M\u200f/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-mr.js b/src/ngLocale/angular-locale_ar-mr.js
index 4477ef7f0822..6fbc49a5bd9d 100644
--- a/src/ngLocale/angular-locale_ar-mr.js
+++ b/src/ngLocale/angular-locale_ar-mr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u062c\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-om.js b/src/ngLocale/angular-locale_ar-om.js
index 11b4872a047a..b12fc5769a89 100644
--- a/src/ngLocale/angular-locale_ar-om.js
+++ b/src/ngLocale/angular-locale_ar-om.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-ps.js b/src/ngLocale/angular-locale_ar-ps.js
index 9e3f5e5c428d..0e5a8aec12a6 100644
--- a/src/ngLocale/angular-locale_ar-ps.js
+++ b/src/ngLocale/angular-locale_ar-ps.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0634\u0628\u0627\u0637",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-qa.js b/src/ngLocale/angular-locale_ar-qa.js
index b472cfb6e9f3..0007850d4db0 100644
--- a/src/ngLocale/angular-locale_ar-qa.js
+++ b/src/ngLocale/angular-locale_ar-qa.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -79,14 +92,14 @@ $provide.value("$locale", {
         "posSuf": ""
       },
       {
-        "gSize": 0,
-        "lgSize": 0,
+        "gSize": 3,
+        "lgSize": 3,
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
-        "posPre": "\u00a4",
+        "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
     ]
diff --git a/src/ngLocale/angular-locale_ar-sa.js b/src/ngLocale/angular-locale_ar-sa.js
index 99fc95d45495..dcaa4a68fd77 100644
--- a/src/ngLocale/angular-locale_ar-sa.js
+++ b/src/ngLocale/angular-locale_ar-sa.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -79,14 +92,14 @@ $provide.value("$locale", {
         "posSuf": ""
       },
       {
-        "gSize": 0,
-        "lgSize": 0,
+        "gSize": 3,
+        "lgSize": 3,
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
-        "posPre": "\u00a4",
+        "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
     ]
diff --git a/src/ngLocale/angular-locale_ar-sd.js b/src/ngLocale/angular-locale_ar-sd.js
index 940f965fef97..769ce9bf9342 100644
--- a/src/ngLocale/angular-locale_ar-sd.js
+++ b/src/ngLocale/angular-locale_ar-sd.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-so.js b/src/ngLocale/angular-locale_ar-so.js
index c45ff906b8b6..4aea4a8ef318 100644
--- a/src/ngLocale/angular-locale_ar-so.js
+++ b/src/ngLocale/angular-locale_ar-so.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-ss.js b/src/ngLocale/angular-locale_ar-ss.js
index 922ce91d6d53..23338b3f4a3b 100644
--- a/src/ngLocale/angular-locale_ar-ss.js
+++ b/src/ngLocale/angular-locale_ar-ss.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "SSP",
+    "CURRENCY_SYM": "\u00a3",
     "DECIMAL_SEP": "\u066b",
     "GROUP_SEP": "\u066c",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-sy.js b/src/ngLocale/angular-locale_ar-sy.js
index fea985d21871..80f4b5ee1b1b 100644
--- a/src/ngLocale/angular-locale_ar-sy.js
+++ b/src/ngLocale/angular-locale_ar-sy.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0634\u0628\u0627\u0637",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
       "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -79,14 +92,14 @@ $provide.value("$locale", {
         "posSuf": ""
       },
       {
-        "gSize": 0,
-        "lgSize": 0,
+        "gSize": 3,
+        "lgSize": 3,
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
-        "posPre": "\u00a4",
+        "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
     ]
diff --git a/src/ngLocale/angular-locale_ar-td.js b/src/ngLocale/angular-locale_ar-td.js
index 4a00893557a1..408e939359c4 100644
--- a/src/ngLocale/angular-locale_ar-td.js
+++ b/src/ngLocale/angular-locale_ar-td.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ar-tn.js b/src/ngLocale/angular-locale_ar-tn.js
index 8b3d216d4f99..2784ed5fb1a0 100644
--- a/src/ngLocale/angular-locale_ar-tn.js
+++ b/src/ngLocale/angular-locale_ar-tn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u062c\u0627\u0646\u0641\u064a",
       "\u0641\u064a\u0641\u0631\u064a",
@@ -53,13 +62,17 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
-    "medium": "y/MM/dd h:mm:ss a",
-    "mediumDate": "y/MM/dd",
+    "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
+    "mediumDate": "dd\u200f/MM\u200f/y",
     "mediumTime": "h:mm:ss a",
-    "short": "y/M/d h:mm a",
-    "shortDate": "y/M/d",
+    "short": "d\u200f/M\u200f/y h:mm a",
+    "shortDate": "d\u200f/M\u200f/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -79,14 +92,14 @@ $provide.value("$locale", {
         "posSuf": ""
       },
       {
-        "gSize": 0,
-        "lgSize": 0,
+        "gSize": 3,
+        "lgSize": 3,
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
-        "posPre": "\u00a4",
+        "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
     ]
diff --git a/src/ngLocale/angular-locale_ar-ye.js b/src/ngLocale/angular-locale_ar-ye.js
index a7415265f1c2..700b4aef0ec1 100644
--- a/src/ngLocale/angular-locale_ar-ye.js
+++ b/src/ngLocale/angular-locale_ar-ye.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -79,14 +92,14 @@ $provide.value("$locale", {
         "posSuf": ""
       },
       {
-        "gSize": 0,
-        "lgSize": 0,
+        "gSize": 3,
+        "lgSize": 3,
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
-        "posPre": "\u00a4",
+        "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
     ]
diff --git a/src/ngLocale/angular-locale_ar.js b/src/ngLocale/angular-locale_ar.js
index ca92a451725d..dd58093d90a7 100644
--- a/src/ngLocale/angular-locale_ar.js
+++ b/src/ngLocale/angular-locale_ar.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",
       "\u0641\u0628\u0631\u0627\u064a\u0631",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0641\u0645\u0628\u0631",
       "\u062f\u064a\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "dd\u200f/MM\u200f/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_as-in.js b/src/ngLocale/angular-locale_as-in.js
index 8ac30a1996ce..27f59242f747 100644
--- a/src/ngLocale/angular-locale_as-in.js
+++ b/src/ngLocale/angular-locale_as-in.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u09b6\u09c1\u0995\u09cd\u09f0\u09ac\u09be\u09f0",
       "\u09b6\u09a8\u09bf\u09ac\u09be\u09f0"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u099c\u09be\u09a8\u09c1\u09f1\u09be\u09f0\u09c0",
       "\u09ab\u09c7\u09ac\u09cd\u09f0\u09c1\u09f1\u09be\u09f0\u09c0",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u09a8\u09ad\u09c7",
       "\u09a1\u09bf\u09b8\u09c7"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "dd-MM-y h.mm.ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_as.js b/src/ngLocale/angular-locale_as.js
index c55ee5c386e1..5172d54c643d 100644
--- a/src/ngLocale/angular-locale_as.js
+++ b/src/ngLocale/angular-locale_as.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u09b6\u09c1\u0995\u09cd\u09f0\u09ac\u09be\u09f0",
       "\u09b6\u09a8\u09bf\u09ac\u09be\u09f0"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u099c\u09be\u09a8\u09c1\u09f1\u09be\u09f0\u09c0",
       "\u09ab\u09c7\u09ac\u09cd\u09f0\u09c1\u09f1\u09be\u09f0\u09c0",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u09a8\u09ad\u09c7",
       "\u09a1\u09bf\u09b8\u09c7"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "dd-MM-y h.mm.ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_asa-tz.js b/src/ngLocale/angular-locale_asa-tz.js
index 8f6c9c613abd..5add04ffb679 100644
--- a/src/ngLocale/angular-locale_asa-tz.js
+++ b/src/ngLocale/angular-locale_asa-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla yakwe Yethu",
+      "Baada yakwe Yethu"
+    ],
+    "ERAS": [
+      "KM",
+      "BM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_asa.js b/src/ngLocale/angular-locale_asa.js
index 98ef450bb857..05e1f0bc8d08 100644
--- a/src/ngLocale/angular-locale_asa.js
+++ b/src/ngLocale/angular-locale_asa.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla yakwe Yethu",
+      "Baada yakwe Yethu"
+    ],
+    "ERAS": [
+      "KM",
+      "BM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_ast-es.js b/src/ngLocale/angular-locale_ast-es.js
index 5dffeda5d9f2..af513b1a0907 100644
--- a/src/ngLocale/angular-locale_ast-es.js
+++ b/src/ngLocale/angular-locale_ast-es.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vienres",
       "s\u00e1badu"
     ],
+    "ERANAMES": [
+      "a.C.",
+      "d.C."
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "de xineru",
       "de febreru",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "pay",
       "avi"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM 'de' y",
     "longDate": "d MMMM 'de' y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ast.js b/src/ngLocale/angular-locale_ast.js
index 4b07ddd09a9d..2fc061ee3ca2 100644
--- a/src/ngLocale/angular-locale_ast.js
+++ b/src/ngLocale/angular-locale_ast.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vienres",
       "s\u00e1badu"
     ],
+    "ERANAMES": [
+      "a.C.",
+      "d.C."
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "de xineru",
       "de febreru",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "pay",
       "avi"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM 'de' y",
     "longDate": "d MMMM 'de' y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_az-cyrl-az.js b/src/ngLocale/angular-locale_az-cyrl-az.js
index 52b4ed171750..1b9a6ad94518 100644
--- a/src/ngLocale/angular-locale_az-cyrl-az.js
+++ b/src/ngLocale/angular-locale_az-cyrl-az.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u04b9\u04af\u043c\u04d9",
       "\u0448\u04d9\u043d\u0431\u04d9"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0432\u0430\u0440",
       "\u0444\u0435\u0432\u0440\u0430\u043b",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0458\u0430\u0431\u0440",
       "\u0434\u0435\u043a\u0430\u0431\u0440"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d, MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_az-cyrl.js b/src/ngLocale/angular-locale_az-cyrl.js
index 40dfe742b1de..d9f52819f0c8 100644
--- a/src/ngLocale/angular-locale_az-cyrl.js
+++ b/src/ngLocale/angular-locale_az-cyrl.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u04b9\u04af\u043c\u04d9",
       "\u0448\u04d9\u043d\u0431\u04d9"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0432\u0430\u0440",
       "\u0444\u0435\u0432\u0440\u0430\u043b",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0458\u0430\u0431\u0440",
       "\u0434\u0435\u043a\u0430\u0431\u0440"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d, MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "man.",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": ".",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_az-latn-az.js b/src/ngLocale/angular-locale_az-latn-az.js
index d805ea58e3fd..72ff9e80edab 100644
--- a/src/ngLocale/angular-locale_az-latn-az.js
+++ b/src/ngLocale/angular-locale_az-latn-az.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "c\u00fcm\u0259",
       "\u015f\u0259nb\u0259"
     ],
+    "ERANAMES": [
+      "eram\u0131zdan \u0259vv\u0259l",
+      "bizim eram\u0131z\u0131n"
+    ],
+    "ERAS": [
+      "e.\u0259.",
+      "b.e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "yanvar",
       "fevral",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "noy",
       "dek"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "d MMMM y, EEEE",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_az-latn.js b/src/ngLocale/angular-locale_az-latn.js
index b5bbc4c06268..c01135c85117 100644
--- a/src/ngLocale/angular-locale_az-latn.js
+++ b/src/ngLocale/angular-locale_az-latn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "c\u00fcm\u0259",
       "\u015f\u0259nb\u0259"
     ],
+    "ERANAMES": [
+      "eram\u0131zdan \u0259vv\u0259l",
+      "bizim eram\u0131z\u0131n"
+    ],
+    "ERAS": [
+      "e.\u0259.",
+      "b.e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "yanvar",
       "fevral",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "noy",
       "dek"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "d MMMM y, EEEE",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "man.",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": ".",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_az.js b/src/ngLocale/angular-locale_az.js
index 7b296d54c0eb..df1dd9e48f55 100644
--- a/src/ngLocale/angular-locale_az.js
+++ b/src/ngLocale/angular-locale_az.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "c\u00fcm\u0259",
       "\u015f\u0259nb\u0259"
     ],
+    "ERANAMES": [
+      "eram\u0131zdan \u0259vv\u0259l",
+      "bizim eram\u0131z\u0131n"
+    ],
+    "ERAS": [
+      "e.\u0259.",
+      "b.e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "yanvar",
       "fevral",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "noy",
       "dek"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "d MMMM y, EEEE",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bas-cm.js b/src/ngLocale/angular-locale_bas-cm.js
index e73106f3a897..ccc7ea070a21 100644
--- a/src/ngLocale/angular-locale_bas-cm.js
+++ b/src/ngLocale/angular-locale_bas-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u014bgw\u00e0 k\u0254\u0254",
       "\u014bgw\u00e0 j\u00f4n"
     ],
+    "ERANAMES": [
+      "bis\u016b bi Yes\u00f9 Kr\u01d0st\u00f2",
+      "i mb\u016bs Yes\u00f9 Kr\u01d0st\u00f2"
+    ],
+    "ERAS": [
+      "b.Y.K",
+      "m.Y.K"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "K\u0254nd\u0254\u014b",
       "M\u00e0c\u025b\u0302l",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "may",
       "li\u0253"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_bas.js b/src/ngLocale/angular-locale_bas.js
index 892314d8821a..e32cc4208271 100644
--- a/src/ngLocale/angular-locale_bas.js
+++ b/src/ngLocale/angular-locale_bas.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u014bgw\u00e0 k\u0254\u0254",
       "\u014bgw\u00e0 j\u00f4n"
     ],
+    "ERANAMES": [
+      "bis\u016b bi Yes\u00f9 Kr\u01d0st\u00f2",
+      "i mb\u016bs Yes\u00f9 Kr\u01d0st\u00f2"
+    ],
+    "ERAS": [
+      "b.Y.K",
+      "m.Y.K"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "K\u0254nd\u0254\u014b",
       "M\u00e0c\u025b\u0302l",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "may",
       "li\u0253"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_be-by.js b/src/ngLocale/angular-locale_be-by.js
index 269873aae80f..87fb319b17ff 100644
--- a/src/ngLocale/angular-locale_be-by.js
+++ b/src/ngLocale/angular-locale_be-by.js
@@ -1,24 +1,6 @@
 'use strict';
 angular.module("ngLocale", [], ["$provide", function($provide) {
 var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
-function getDecimals(n) {
-  n = n + '';
-  var i = n.indexOf('.');
-  return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
-  var v = opt_precision;
-
-  if (undefined === v) {
-    v = Math.min(getDecimals(n), 3);
-  }
-
-  var base = Math.pow(10, v);
-  var f = ((n * base) | 0) % base;
-  return {v: v, f: f};
-}
-
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
@@ -34,6 +16,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0456\u0446\u0430",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u0430 \u043d.\u044d.",
+      "\u043d.\u044d."
+    ],
+    "ERAS": [
+      "\u0434\u0430 \u043d.\u044d.",
+      "\u043d.\u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044f",
       "\u043b\u044e\u0442\u0430\u0433\u0430",
@@ -71,6 +62,10 @@ $provide.value("$locale", {
       "\u043b\u0456\u0441",
       "\u0441\u043d\u0435"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d.M.y HH.mm.ss",
@@ -102,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
@@ -110,6 +105,6 @@ $provide.value("$locale", {
     ]
   },
   "id": "be-by",
-  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+  "pluralCat": function(n, opt_precision) {  if (n % 10 == 1 && n % 100 != 11) {    return PLURAL_CATEGORY.ONE;  }  if (n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) {    return PLURAL_CATEGORY.FEW;  }  if (n % 10 == 0 || n % 10 >= 5 && n % 10 <= 9 || n % 100 >= 11 && n % 100 <= 14) {    return PLURAL_CATEGORY.MANY;  }  return PLURAL_CATEGORY.OTHER;}
 });
 }]);
diff --git a/src/ngLocale/angular-locale_be.js b/src/ngLocale/angular-locale_be.js
index 136132046f0e..8baa3cedc94a 100644
--- a/src/ngLocale/angular-locale_be.js
+++ b/src/ngLocale/angular-locale_be.js
@@ -1,24 +1,6 @@
 'use strict';
 angular.module("ngLocale", [], ["$provide", function($provide) {
 var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
-function getDecimals(n) {
-  n = n + '';
-  var i = n.indexOf('.');
-  return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
-  var v = opt_precision;
-
-  if (undefined === v) {
-    v = Math.min(getDecimals(n), 3);
-  }
-
-  var base = Math.pow(10, v);
-  var f = ((n * base) | 0) % base;
-  return {v: v, f: f};
-}
-
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
@@ -34,6 +16,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0456\u0446\u0430",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u0430 \u043d.\u044d.",
+      "\u043d.\u044d."
+    ],
+    "ERAS": [
+      "\u0434\u0430 \u043d.\u044d.",
+      "\u043d.\u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044f",
       "\u043b\u044e\u0442\u0430\u0433\u0430",
@@ -71,6 +62,10 @@ $provide.value("$locale", {
       "\u043b\u0456\u0441",
       "\u0441\u043d\u0435"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d.M.y HH.mm.ss",
@@ -102,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
@@ -110,6 +105,6 @@ $provide.value("$locale", {
     ]
   },
   "id": "be",
-  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+  "pluralCat": function(n, opt_precision) {  if (n % 10 == 1 && n % 100 != 11) {    return PLURAL_CATEGORY.ONE;  }  if (n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) {    return PLURAL_CATEGORY.FEW;  }  if (n % 10 == 0 || n % 10 >= 5 && n % 10 <= 9 || n % 100 >= 11 && n % 100 <= 14) {    return PLURAL_CATEGORY.MANY;  }  return PLURAL_CATEGORY.OTHER;}
 });
 }]);
diff --git a/src/ngLocale/angular-locale_bem-zm.js b/src/ngLocale/angular-locale_bem-zm.js
index d7db2caa02f4..307347a84508 100644
--- a/src/ngLocale/angular-locale_bem-zm.js
+++ b/src/ngLocale/angular-locale_bem-zm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Palichisano",
       "Pachibelushi"
     ],
+    "ERANAMES": [
+      "Before Yesu",
+      "After Yesu"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bem.js b/src/ngLocale/angular-locale_bem.js
index b96da28f2758..99778938db6c 100644
--- a/src/ngLocale/angular-locale_bem.js
+++ b/src/ngLocale/angular-locale_bem.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Palichisano",
       "Pachibelushi"
     ],
+    "ERANAMES": [
+      "Before Yesu",
+      "After Yesu"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bez-tz.js b/src/ngLocale/angular-locale_bez-tz.js
index 8d0b5bd8059e..d8d80a1b28f3 100644
--- a/src/ngLocale/angular-locale_bez-tz.js
+++ b/src/ngLocale/angular-locale_bez-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "pa hihanu",
       "pa shahulembela"
     ],
+    "ERANAMES": [
+      "Kabla ya Mtwaa",
+      "Baada ya Mtwaa"
+    ],
+    "ERAS": [
+      "KM",
+      "BM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "pa mwedzi gwa hutala",
       "pa mwedzi gwa wuvili",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Kmj",
       "Kmb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_bez.js b/src/ngLocale/angular-locale_bez.js
index ff4bd6ae764c..a240ee9b1aae 100644
--- a/src/ngLocale/angular-locale_bez.js
+++ b/src/ngLocale/angular-locale_bez.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "pa hihanu",
       "pa shahulembela"
     ],
+    "ERANAMES": [
+      "Kabla ya Mtwaa",
+      "Baada ya Mtwaa"
+    ],
+    "ERAS": [
+      "KM",
+      "BM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "pa mwedzi gwa hutala",
       "pa mwedzi gwa wuvili",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Kmj",
       "Kmb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_bg-bg.js b/src/ngLocale/angular-locale_bg-bg.js
index 20b7b26e709d..984801da0c60 100644
--- a/src/ngLocale/angular-locale_bg-bg.js
+++ b/src/ngLocale/angular-locale_bg-bg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u044a\u043a",
       "\u0441\u044a\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u043f\u0440\u0435\u0434\u0438 \u0425\u0440\u0438\u0441\u0442\u0430",
+      "\u0441\u043b\u0435\u0434 \u0425\u0440\u0438\u0441\u0442\u0430"
+    ],
+    "ERAS": [
+      "\u043f\u0440.\u0425\u0440.",
+      "\u0441\u043b.\u0425\u0440."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0443\u0430\u0440\u0438",
       "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0435\u043c.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
     "longDate": "d MMMM y '\u0433'.",
     "medium": "d.MM.y '\u0433'. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_bg.js b/src/ngLocale/angular-locale_bg.js
index 259836510049..1bfb13282839 100644
--- a/src/ngLocale/angular-locale_bg.js
+++ b/src/ngLocale/angular-locale_bg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u044a\u043a",
       "\u0441\u044a\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u043f\u0440\u0435\u0434\u0438 \u0425\u0440\u0438\u0441\u0442\u0430",
+      "\u0441\u043b\u0435\u0434 \u0425\u0440\u0438\u0441\u0442\u0430"
+    ],
+    "ERAS": [
+      "\u043f\u0440.\u0425\u0440.",
+      "\u0441\u043b.\u0425\u0440."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0443\u0430\u0440\u0438",
       "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0435\u043c.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
     "longDate": "d MMMM y '\u0433'.",
     "medium": "d.MM.y '\u0433'. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_bm-latn-ml.js b/src/ngLocale/angular-locale_bm-latn-ml.js
index e8214c5f7819..6a0b184aa6e3 100644
--- a/src/ngLocale/angular-locale_bm-latn-ml.js
+++ b/src/ngLocale/angular-locale_bm-latn-ml.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "juma",
       "sibiri"
     ],
+    "ERANAMES": [
+      "jezu krisiti \u0272\u025b",
+      "jezu krisiti mink\u025b"
+    ],
+    "ERAS": [
+      "J.-C. \u0272\u025b",
+      "ni J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "zanwuye",
       "feburuye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "now",
       "des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bm-latn.js b/src/ngLocale/angular-locale_bm-latn.js
index cc90ba44d040..686fcf157e74 100644
--- a/src/ngLocale/angular-locale_bm-latn.js
+++ b/src/ngLocale/angular-locale_bm-latn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "juma",
       "sibiri"
     ],
+    "ERANAMES": [
+      "jezu krisiti \u0272\u025b",
+      "jezu krisiti mink\u025b"
+    ],
+    "ERAS": [
+      "J.-C. \u0272\u025b",
+      "ni J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "zanwuye",
       "feburuye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "now",
       "des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "CFA",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bm.js b/src/ngLocale/angular-locale_bm.js
index 1402eb18686f..30c2cf0bd0cd 100644
--- a/src/ngLocale/angular-locale_bm.js
+++ b/src/ngLocale/angular-locale_bm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "juma",
       "sibiri"
     ],
+    "ERANAMES": [
+      "jezu krisiti \u0272\u025b",
+      "jezu krisiti mink\u025b"
+    ],
+    "ERAS": [
+      "J.-C. \u0272\u025b",
+      "ni J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "zanwuye",
       "feburuye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "now",
       "des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bn-bd.js b/src/ngLocale/angular-locale_bn-bd.js
index 2443e9b59cbc..24fb37ae5891 100644
--- a/src/ngLocale/angular-locale_bn-bd.js
+++ b/src/ngLocale/angular-locale_bn-bd.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u09b6\u09c1\u0995\u09cd\u09b0\u09ac\u09be\u09b0",
       "\u09b6\u09a8\u09bf\u09ac\u09be\u09b0"
     ],
+    "ERANAMES": [
+      "\u0996\u09cd\u09b0\u09bf\u09b8\u09cd\u099f\u09aa\u09c2\u09b0\u09cd\u09ac",
+      "\u0996\u09c3\u09b7\u09cd\u099f\u09be\u09ac\u09cd\u09a6"
+    ],
+    "ERAS": [
+      "\u0996\u09cd\u09b0\u09bf\u09b8\u09cd\u099f\u09aa\u09c2\u09b0\u09cd\u09ac",
+      "\u0996\u09c3\u09b7\u09cd\u099f\u09be\u09ac\u09cd\u09a6"
+    ],
+    "FIRSTDAYOFWEEK": 4,
     "MONTH": [
       "\u099c\u09be\u09a8\u09c1\u09af\u09bc\u09be\u09b0\u09c0",
       "\u09ab\u09c7\u09ac\u09cd\u09b0\u09c1\u09af\u09bc\u09be\u09b0\u09c0",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u09a8\u09ad\u09c7\u09ae\u09cd\u09ac\u09b0",
       "\u09a1\u09bf\u09b8\u09c7\u09ae\u09cd\u09ac\u09b0"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_bn-in.js b/src/ngLocale/angular-locale_bn-in.js
index 2183318e35b6..63a3c3e6e244 100644
--- a/src/ngLocale/angular-locale_bn-in.js
+++ b/src/ngLocale/angular-locale_bn-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u09b6\u09c1\u0995\u09cd\u09b0\u09ac\u09be\u09b0",
       "\u09b6\u09a8\u09bf\u09ac\u09be\u09b0"
     ],
+    "ERANAMES": [
+      "\u0996\u09cd\u09b0\u09bf\u09b8\u09cd\u099f\u09aa\u09c2\u09b0\u09cd\u09ac",
+      "\u0996\u09c3\u09b7\u09cd\u099f\u09be\u09ac\u09cd\u09a6"
+    ],
+    "ERAS": [
+      "\u0996\u09cd\u09b0\u09bf\u09b8\u09cd\u099f\u09aa\u09c2\u09b0\u09cd\u09ac",
+      "\u0996\u09c3\u09b7\u09cd\u099f\u09be\u09ac\u09cd\u09a6"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u099c\u09be\u09a8\u09c1\u09af\u09bc\u09be\u09b0\u09c0",
       "\u09ab\u09c7\u09ac\u09cd\u09b0\u09c1\u09af\u09bc\u09be\u09b0\u09c0",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u09a8\u09ad\u09c7\u09ae\u09cd\u09ac\u09b0",
       "\u09a1\u09bf\u09b8\u09c7\u09ae\u09cd\u09ac\u09b0"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_bn.js b/src/ngLocale/angular-locale_bn.js
index 4d6730dd1369..022ce931e250 100644
--- a/src/ngLocale/angular-locale_bn.js
+++ b/src/ngLocale/angular-locale_bn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u09b6\u09c1\u0995\u09cd\u09b0\u09ac\u09be\u09b0",
       "\u09b6\u09a8\u09bf\u09ac\u09be\u09b0"
     ],
+    "ERANAMES": [
+      "\u0996\u09cd\u09b0\u09bf\u09b8\u09cd\u099f\u09aa\u09c2\u09b0\u09cd\u09ac",
+      "\u0996\u09c3\u09b7\u09cd\u099f\u09be\u09ac\u09cd\u09a6"
+    ],
+    "ERAS": [
+      "\u0996\u09cd\u09b0\u09bf\u09b8\u09cd\u099f\u09aa\u09c2\u09b0\u09cd\u09ac",
+      "\u0996\u09c3\u09b7\u09cd\u099f\u09be\u09ac\u09cd\u09a6"
+    ],
+    "FIRSTDAYOFWEEK": 4,
     "MONTH": [
       "\u099c\u09be\u09a8\u09c1\u09af\u09bc\u09be\u09b0\u09c0",
       "\u09ab\u09c7\u09ac\u09cd\u09b0\u09c1\u09af\u09bc\u09be\u09b0\u09c0",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u09a8\u09ad\u09c7\u09ae\u09cd\u09ac\u09b0",
       "\u09a1\u09bf\u09b8\u09c7\u09ae\u09cd\u09ac\u09b0"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_bo-cn.js b/src/ngLocale/angular-locale_bo-cn.js
index 79e1087c55a2..ea07069766e3 100644
--- a/src/ngLocale/angular-locale_bo-cn.js
+++ b/src/ngLocale/angular-locale_bo-cn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0f42\u0f5f\u0f60\u0f0b\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b",
       "\u0f42\u0f5f\u0f60\u0f0b\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b"
     ],
+    "ERANAMES": [
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0b\u0f66\u0f94\u0f7c\u0f53\u0f0d",
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0d"
+    ],
+    "ERAS": [
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0b\u0f66\u0f94\u0f7c\u0f53\u0f0d",
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f44\u0f0b\u0f54\u0f7c\u0f0b",
       "\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54\u0f0b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0f5f\u0fb3\u0f0b\u0f21\u0f21",
       "\u0f5f\u0fb3\u0f0b\u0f21\u0f22"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by MMMM\u0f60\u0f72\u0f0b\u0f59\u0f7a\u0f66\u0f0bd\u0f51",
     "medium": "y \u0f63\u0f7c\u0f0b\u0f60\u0f72\u0f0bMMM\u0f59\u0f7a\u0f66\u0f0bd HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bo-in.js b/src/ngLocale/angular-locale_bo-in.js
index 64b482c8a87b..89738d3888a7 100644
--- a/src/ngLocale/angular-locale_bo-in.js
+++ b/src/ngLocale/angular-locale_bo-in.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0f42\u0f5f\u0f60\u0f0b\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b",
       "\u0f42\u0f5f\u0f60\u0f0b\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b"
     ],
+    "ERANAMES": [
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0b\u0f66\u0f94\u0f7c\u0f53\u0f0d",
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0d"
+    ],
+    "ERAS": [
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0b\u0f66\u0f94\u0f7c\u0f53\u0f0d",
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f44\u0f0b\u0f54\u0f7c\u0f0b",
       "\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54\u0f0b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0f5f\u0fb3\u0f0b\u0f21\u0f21",
       "\u0f5f\u0fb3\u0f0b\u0f21\u0f22"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by MMMM\u0f60\u0f72\u0f0b\u0f59\u0f7a\u0f66\u0f0bd\u0f51",
     "medium": "y \u0f63\u0f7c\u0f0b\u0f60\u0f72\u0f0bMMM\u0f59\u0f7a\u0f66\u0f0bd HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bo.js b/src/ngLocale/angular-locale_bo.js
index c97bc68f0139..117e4d6aaac0 100644
--- a/src/ngLocale/angular-locale_bo.js
+++ b/src/ngLocale/angular-locale_bo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0f42\u0f5f\u0f60\u0f0b\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b",
       "\u0f42\u0f5f\u0f60\u0f0b\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b"
     ],
+    "ERANAMES": [
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0b\u0f66\u0f94\u0f7c\u0f53\u0f0d",
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0d"
+    ],
+    "ERAS": [
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0b\u0f66\u0f94\u0f7c\u0f53\u0f0d",
+      "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f44\u0f0b\u0f54\u0f7c\u0f0b",
       "\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54\u0f0b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0f5f\u0fb3\u0f0b\u0f21\u0f21",
       "\u0f5f\u0fb3\u0f0b\u0f21\u0f22"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by MMMM\u0f60\u0f72\u0f0b\u0f59\u0f7a\u0f66\u0f0bd\u0f51",
     "medium": "y \u0f63\u0f7c\u0f0b\u0f60\u0f72\u0f0bMMM\u0f59\u0f7a\u0f66\u0f0bd HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_br-fr.js b/src/ngLocale/angular-locale_br-fr.js
index c63e558ae268..111b19cf7800 100644
--- a/src/ngLocale/angular-locale_br-fr.js
+++ b/src/ngLocale/angular-locale_br-fr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Gwener",
       "Sadorn"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Genver",
       "C\u02bchwevrer",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Du",
       "Ker"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_br.js b/src/ngLocale/angular-locale_br.js
index 08114a677901..2fbf8714295f 100644
--- a/src/ngLocale/angular-locale_br.js
+++ b/src/ngLocale/angular-locale_br.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Gwener",
       "Sadorn"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Genver",
       "C\u02bchwevrer",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Du",
       "Ker"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_brx-in.js b/src/ngLocale/angular-locale_brx-in.js
index 77b8796dcc07..2d6ad8472316 100644
--- a/src/ngLocale/angular-locale_brx-in.js
+++ b/src/ngLocale/angular-locale_brx-in.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0938\u0941\u0916\u0941\u0930\u092c\u093e\u0930",
       "\u0938\u0941\u0928\u093f\u092c\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u093e.\u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928"
+    ],
+    "ERAS": [
+      "\u0908\u0938\u093e.\u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u091c\u093e\u0928\u0941\u0935\u093e\u0930\u0940",
       "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0928\u092c\u0947\u091c\u094d\u092c\u093c\u0930",
       "\u0926\u093f\u0938\u0947\u091c\u094d\u092c\u093c\u0930"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_brx.js b/src/ngLocale/angular-locale_brx.js
index 790c90273b0d..85aa1d7d2224 100644
--- a/src/ngLocale/angular-locale_brx.js
+++ b/src/ngLocale/angular-locale_brx.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0938\u0941\u0916\u0941\u0930\u092c\u093e\u0930",
       "\u0938\u0941\u0928\u093f\u092c\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u093e.\u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928"
+    ],
+    "ERAS": [
+      "\u0908\u0938\u093e.\u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u091c\u093e\u0928\u0941\u0935\u093e\u0930\u0940",
       "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0928\u092c\u0947\u091c\u094d\u092c\u093c\u0930",
       "\u0926\u093f\u0938\u0947\u091c\u094d\u092c\u093c\u0930"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_bs-cyrl-ba.js b/src/ngLocale/angular-locale_bs-cyrl-ba.js
index 18d9f306a8b8..24322a440a65 100644
--- a/src/ngLocale/angular-locale_bs-cyrl-ba.js
+++ b/src/ngLocale/angular-locale_bs-cyrl-ba.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u0430\u043a",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+      "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435"
+    ],
+    "ERAS": [
+      "\u043f. \u043d. \u0435.",
+      "\u043d. \u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440",
       "\u0444\u0435\u0431\u0440\u0443\u0430\u0440",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0432",
       "\u0434\u0435\u0446"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH:mm:ss",
@@ -110,6 +123,6 @@ $provide.value("$locale", {
     ]
   },
   "id": "bs-cyrl-ba",
-  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (vf.v == 0 && i % 10 == 1 && i % 100 != 11 || vf.f % 10 == 1 && vf.f % 100 != 11) {    return PLURAL_CATEGORY.ONE;  }  if (vf.v == 0 && i % 10 >= 2 && i % 10 <= 4 && (i % 100 < 12 || i % 100 > 14) || vf.f % 10 >= 2 && vf.f % 10 <= 4 && (vf.f % 100 < 12 || vf.f % 100 > 14)) {    return PLURAL_CATEGORY.FEW;  }  return PLURAL_CATEGORY.OTHER;}
 });
 }]);
diff --git a/src/ngLocale/angular-locale_bs-cyrl.js b/src/ngLocale/angular-locale_bs-cyrl.js
index 6fcd342909e4..63e52e07a60f 100644
--- a/src/ngLocale/angular-locale_bs-cyrl.js
+++ b/src/ngLocale/angular-locale_bs-cyrl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u0430\u043a",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+      "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435"
+    ],
+    "ERAS": [
+      "\u043f. \u043d. \u0435.",
+      "\u043d. \u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440",
       "\u0444\u0435\u0431\u0440\u0443\u0430\u0440",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0432",
       "\u0434\u0435\u0446"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "KM",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": ".",
     "PATTERNS": [
@@ -110,6 +123,6 @@ $provide.value("$locale", {
     ]
   },
   "id": "bs-cyrl",
-  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (vf.v == 0 && i % 10 == 1 && i % 100 != 11 || vf.f % 10 == 1 && vf.f % 100 != 11) {    return PLURAL_CATEGORY.ONE;  }  if (vf.v == 0 && i % 10 >= 2 && i % 10 <= 4 && (i % 100 < 12 || i % 100 > 14) || vf.f % 10 >= 2 && vf.f % 10 <= 4 && (vf.f % 100 < 12 || vf.f % 100 > 14)) {    return PLURAL_CATEGORY.FEW;  }  return PLURAL_CATEGORY.OTHER;}
 });
 }]);
diff --git a/src/ngLocale/angular-locale_bs-latn-ba.js b/src/ngLocale/angular-locale_bs-latn-ba.js
index 978b45194eec..32c933ac6d5b 100644
--- a/src/ngLocale/angular-locale_bs-latn-ba.js
+++ b/src/ngLocale/angular-locale_bs-latn-ba.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Prije nove ere",
+      "Nove ere"
+    ],
+    "ERAS": [
+      "p. n. e.",
+      "n. e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd. MMM. y. HH:mm:ss",
@@ -110,6 +123,6 @@ $provide.value("$locale", {
     ]
   },
   "id": "bs-latn-ba",
-  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (vf.v == 0 && i % 10 == 1 && i % 100 != 11 || vf.f % 10 == 1 && vf.f % 100 != 11) {    return PLURAL_CATEGORY.ONE;  }  if (vf.v == 0 && i % 10 >= 2 && i % 10 <= 4 && (i % 100 < 12 || i % 100 > 14) || vf.f % 10 >= 2 && vf.f % 10 <= 4 && (vf.f % 100 < 12 || vf.f % 100 > 14)) {    return PLURAL_CATEGORY.FEW;  }  return PLURAL_CATEGORY.OTHER;}
 });
 }]);
diff --git a/src/ngLocale/angular-locale_bs-latn.js b/src/ngLocale/angular-locale_bs-latn.js
index ae0a3ba3b3c1..b5e5f925dd5f 100644
--- a/src/ngLocale/angular-locale_bs-latn.js
+++ b/src/ngLocale/angular-locale_bs-latn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Prije nove ere",
+      "Nove ere"
+    ],
+    "ERAS": [
+      "p. n. e.",
+      "n. e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd. MMM. y. HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "KM",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": ".",
     "PATTERNS": [
@@ -110,6 +123,6 @@ $provide.value("$locale", {
     ]
   },
   "id": "bs-latn",
-  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (vf.v == 0 && i % 10 == 1 && i % 100 != 11 || vf.f % 10 == 1 && vf.f % 100 != 11) {    return PLURAL_CATEGORY.ONE;  }  if (vf.v == 0 && i % 10 >= 2 && i % 10 <= 4 && (i % 100 < 12 || i % 100 > 14) || vf.f % 10 >= 2 && vf.f % 10 <= 4 && (vf.f % 100 < 12 || vf.f % 100 > 14)) {    return PLURAL_CATEGORY.FEW;  }  return PLURAL_CATEGORY.OTHER;}
 });
 }]);
diff --git a/src/ngLocale/angular-locale_bs.js b/src/ngLocale/angular-locale_bs.js
index 11edf78b23aa..c9cf4634c15d 100644
--- a/src/ngLocale/angular-locale_bs.js
+++ b/src/ngLocale/angular-locale_bs.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Prije nove ere",
+      "Nove ere"
+    ],
+    "ERAS": [
+      "p. n. e.",
+      "n. e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd. MMM. y. HH:mm:ss",
@@ -110,6 +123,6 @@ $provide.value("$locale", {
     ]
   },
   "id": "bs",
-  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (vf.v == 0 && i % 10 == 1 && i % 100 != 11 || vf.f % 10 == 1 && vf.f % 100 != 11) {    return PLURAL_CATEGORY.ONE;  }  if (vf.v == 0 && i % 10 >= 2 && i % 10 <= 4 && (i % 100 < 12 || i % 100 > 14) || vf.f % 10 >= 2 && vf.f % 10 <= 4 && (vf.f % 100 < 12 || vf.f % 100 > 14)) {    return PLURAL_CATEGORY.FEW;  }  return PLURAL_CATEGORY.OTHER;}
 });
 }]);
diff --git a/src/ngLocale/angular-locale_ca-ad.js b/src/ngLocale/angular-locale_ca-ad.js
index 988c3c1c5d98..448306454d67 100644
--- a/src/ngLocale/angular-locale_ca-ad.js
+++ b/src/ngLocale/angular-locale_ca-ad.js
@@ -34,19 +34,28 @@ $provide.value("$locale", {
       "divendres",
       "dissabte"
     ],
+    "ERANAMES": [
+      "abans de Crist",
+      "despr\u00e9s de Crist"
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
-      "gener",
-      "febrer",
-      "mar\u00e7",
-      "abril",
-      "maig",
-      "juny",
-      "juliol",
-      "agost",
-      "setembre",
-      "octubre",
-      "novembre",
-      "desembre"
+      "de gener",
+      "de febrer",
+      "de mar\u00e7",
+      "d\u2019abril",
+      "de maig",
+      "de juny",
+      "de juliol",
+      "d\u2019agost",
+      "de setembre",
+      "d\u2019octubre",
+      "de novembre",
+      "de desembre"
     ],
     "SHORTDAY": [
       "dg.",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM 'de' y",
     "longDate": "d MMMM 'de' y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ca-es-valencia.js b/src/ngLocale/angular-locale_ca-es-valencia.js
index 4a1e28a69428..725478c4dc99 100644
--- a/src/ngLocale/angular-locale_ca-es-valencia.js
+++ b/src/ngLocale/angular-locale_ca-es-valencia.js
@@ -34,19 +34,28 @@ $provide.value("$locale", {
       "divendres",
       "dissabte"
     ],
+    "ERANAMES": [
+      "abans de Crist",
+      "despr\u00e9s de Crist"
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
-      "gener",
-      "febrer",
-      "mar\u00e7",
-      "abril",
-      "maig",
-      "juny",
-      "juliol",
-      "agost",
-      "setembre",
-      "octubre",
-      "novembre",
-      "desembre"
+      "de gener",
+      "de febrer",
+      "de mar\u00e7",
+      "d\u2019abril",
+      "de maig",
+      "de juny",
+      "de juliol",
+      "d\u2019agost",
+      "de setembre",
+      "d\u2019octubre",
+      "de novembre",
+      "de desembre"
     ],
     "SHORTDAY": [
       "dg.",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM 'de' y",
     "longDate": "d MMMM 'de' y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ca-es.js b/src/ngLocale/angular-locale_ca-es.js
index f83aacf237cc..427201b61d44 100644
--- a/src/ngLocale/angular-locale_ca-es.js
+++ b/src/ngLocale/angular-locale_ca-es.js
@@ -34,19 +34,28 @@ $provide.value("$locale", {
       "divendres",
       "dissabte"
     ],
+    "ERANAMES": [
+      "abans de Crist",
+      "despr\u00e9s de Crist"
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
-      "gener",
-      "febrer",
-      "mar\u00e7",
-      "abril",
-      "maig",
-      "juny",
-      "juliol",
-      "agost",
-      "setembre",
-      "octubre",
-      "novembre",
-      "desembre"
+      "de gener",
+      "de febrer",
+      "de mar\u00e7",
+      "d\u2019abril",
+      "de maig",
+      "de juny",
+      "de juliol",
+      "d\u2019agost",
+      "de setembre",
+      "d\u2019octubre",
+      "de novembre",
+      "de desembre"
     ],
     "SHORTDAY": [
       "dg.",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM 'de' y",
     "longDate": "d MMMM 'de' y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ca-fr.js b/src/ngLocale/angular-locale_ca-fr.js
index 232bb242e0d7..22f1f7b3b185 100644
--- a/src/ngLocale/angular-locale_ca-fr.js
+++ b/src/ngLocale/angular-locale_ca-fr.js
@@ -34,19 +34,28 @@ $provide.value("$locale", {
       "divendres",
       "dissabte"
     ],
+    "ERANAMES": [
+      "abans de Crist",
+      "despr\u00e9s de Crist"
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
-      "gener",
-      "febrer",
-      "mar\u00e7",
-      "abril",
-      "maig",
-      "juny",
-      "juliol",
-      "agost",
-      "setembre",
-      "octubre",
-      "novembre",
-      "desembre"
+      "de gener",
+      "de febrer",
+      "de mar\u00e7",
+      "d\u2019abril",
+      "de maig",
+      "de juny",
+      "de juliol",
+      "d\u2019agost",
+      "de setembre",
+      "d\u2019octubre",
+      "de novembre",
+      "de desembre"
     ],
     "SHORTDAY": [
       "dg.",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM 'de' y",
     "longDate": "d MMMM 'de' y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ca-it.js b/src/ngLocale/angular-locale_ca-it.js
index ef4c3f5792da..8bb952cf5add 100644
--- a/src/ngLocale/angular-locale_ca-it.js
+++ b/src/ngLocale/angular-locale_ca-it.js
@@ -34,19 +34,28 @@ $provide.value("$locale", {
       "divendres",
       "dissabte"
     ],
+    "ERANAMES": [
+      "abans de Crist",
+      "despr\u00e9s de Crist"
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
-      "gener",
-      "febrer",
-      "mar\u00e7",
-      "abril",
-      "maig",
-      "juny",
-      "juliol",
-      "agost",
-      "setembre",
-      "octubre",
-      "novembre",
-      "desembre"
+      "de gener",
+      "de febrer",
+      "de mar\u00e7",
+      "d\u2019abril",
+      "de maig",
+      "de juny",
+      "de juliol",
+      "d\u2019agost",
+      "de setembre",
+      "d\u2019octubre",
+      "de novembre",
+      "de desembre"
     ],
     "SHORTDAY": [
       "dg.",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM 'de' y",
     "longDate": "d MMMM 'de' y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ca.js b/src/ngLocale/angular-locale_ca.js
index 845f1e3176f6..9f1a6069878b 100644
--- a/src/ngLocale/angular-locale_ca.js
+++ b/src/ngLocale/angular-locale_ca.js
@@ -34,19 +34,28 @@ $provide.value("$locale", {
       "divendres",
       "dissabte"
     ],
+    "ERANAMES": [
+      "abans de Crist",
+      "despr\u00e9s de Crist"
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
-      "gener",
-      "febrer",
-      "mar\u00e7",
-      "abril",
-      "maig",
-      "juny",
-      "juliol",
-      "agost",
-      "setembre",
-      "octubre",
-      "novembre",
-      "desembre"
+      "de gener",
+      "de febrer",
+      "de mar\u00e7",
+      "d\u2019abril",
+      "de maig",
+      "de juny",
+      "de juliol",
+      "d\u2019agost",
+      "de setembre",
+      "d\u2019octubre",
+      "de novembre",
+      "de desembre"
     ],
     "SHORTDAY": [
       "dg.",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM 'de' y",
     "longDate": "d MMMM 'de' y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_cgg-ug.js b/src/ngLocale/angular-locale_cgg-ug.js
index 9b1139c04e69..544346c03415 100644
--- a/src/ngLocale/angular-locale_cgg-ug.js
+++ b/src/ngLocale/angular-locale_cgg-ug.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Orwakataano",
       "Orwamukaaga"
     ],
+    "ERANAMES": [
+      "Kurisito Atakaijire",
+      "Kurisito Yaijire"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Okwokubanza",
       "Okwakabiri",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KNK",
       "KNB"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_cgg.js b/src/ngLocale/angular-locale_cgg.js
index 49f41f7a2dba..7068c52244e2 100644
--- a/src/ngLocale/angular-locale_cgg.js
+++ b/src/ngLocale/angular-locale_cgg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Orwakataano",
       "Orwamukaaga"
     ],
+    "ERANAMES": [
+      "Kurisito Atakaijire",
+      "Kurisito Yaijire"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Okwokubanza",
       "Okwakabiri",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KNK",
       "KNB"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_chr-us.js b/src/ngLocale/angular-locale_chr-us.js
index 56a2c1d4cd83..bc9e92203b2f 100644
--- a/src/ngLocale/angular-locale_chr-us.js
+++ b/src/ngLocale/angular-locale_chr-us.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u13e7\u13be\u13a9\u13b6\u13cd\u13d7",
       "\u13a4\u13be\u13d9\u13d3\u13c8\u13d5\u13be"
     ],
+    "ERANAMES": [
+      "\u13cf \u13e5\u13cc \u13be\u13d5\u13b2\u13cd\u13ac\u13be",
+      "\u13a0\u13a9\u13c3\u13ae\u13b5\u13d3\u13cd\u13d7\u13f1 \u13a0\u13d5\u13d8\u13f1\u13cd\u13ac \u13f1\u13b0\u13e9 \u13e7\u13d3\u13c2\u13b8\u13a2\u13cd\u13d7"
+    ],
+    "ERAS": [
+      "\u13a4\u13d3\u13b7\u13b8",
+      "\u13a4\u13b6\u13d0\u13c5"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u13a4\u13c3\u13b8\u13d4\u13c5",
       "\u13a7\u13a6\u13b5",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u13c5\u13d3",
       "\u13a5\u13cd"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_chr.js b/src/ngLocale/angular-locale_chr.js
index 9ef4e74437f4..589816f9f9e6 100644
--- a/src/ngLocale/angular-locale_chr.js
+++ b/src/ngLocale/angular-locale_chr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u13e7\u13be\u13a9\u13b6\u13cd\u13d7",
       "\u13a4\u13be\u13d9\u13d3\u13c8\u13d5\u13be"
     ],
+    "ERANAMES": [
+      "\u13cf \u13e5\u13cc \u13be\u13d5\u13b2\u13cd\u13ac\u13be",
+      "\u13a0\u13a9\u13c3\u13ae\u13b5\u13d3\u13cd\u13d7\u13f1 \u13a0\u13d5\u13d8\u13f1\u13cd\u13ac \u13f1\u13b0\u13e9 \u13e7\u13d3\u13c2\u13b8\u13a2\u13cd\u13d7"
+    ],
+    "ERAS": [
+      "\u13a4\u13d3\u13b7\u13b8",
+      "\u13a4\u13b6\u13d0\u13c5"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u13a4\u13c3\u13b8\u13d4\u13c5",
       "\u13a7\u13a6\u13b5",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u13c5\u13d3",
       "\u13a5\u13cd"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ckb-arab-iq.js b/src/ngLocale/angular-locale_ckb-arab-iq.js
index a2a2fc6c6db9..083bf1828325 100644
--- a/src/ngLocale/angular-locale_ckb-arab-iq.js
+++ b/src/ngLocale/angular-locale_ckb-arab-iq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u06be\u06d5\u06cc\u0646\u06cc",
       "\u0634\u06d5\u0645\u0645\u06d5"
     ],
+    "ERANAMES": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
+      "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
+    ],
+    "ERAS": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
+      "\u0632"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u0634\u0648\u0628\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "d\u06cc MMMM\u06cc y",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ckb-arab-ir.js b/src/ngLocale/angular-locale_ckb-arab-ir.js
index 1fc39ec10c05..cc23f51edc00 100644
--- a/src/ngLocale/angular-locale_ckb-arab-ir.js
+++ b/src/ngLocale/angular-locale_ckb-arab-ir.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u06be\u06d5\u06cc\u0646\u06cc",
       "\u0634\u06d5\u0645\u0645\u06d5"
     ],
+    "ERANAMES": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
+      "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
+    ],
+    "ERAS": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
+      "\u0632"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u0634\u0648\u0628\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "d\u06cc MMMM\u06cc y",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ckb-arab.js b/src/ngLocale/angular-locale_ckb-arab.js
index 76ab613ca9af..8f1fd7003a1a 100644
--- a/src/ngLocale/angular-locale_ckb-arab.js
+++ b/src/ngLocale/angular-locale_ckb-arab.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u06be\u06d5\u06cc\u0646\u06cc",
       "\u0634\u06d5\u0645\u0645\u06d5"
     ],
+    "ERANAMES": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
+      "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
+    ],
+    "ERAS": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
+      "\u0632"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u0634\u0648\u0628\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "d\u06cc MMMM\u06cc y",
     "medium": "y MMM d HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "din",
     "DECIMAL_SEP": "\u066b",
     "GROUP_SEP": "\u066c",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ckb-iq.js b/src/ngLocale/angular-locale_ckb-iq.js
index 879c6afbbfc1..2786ebd7120b 100644
--- a/src/ngLocale/angular-locale_ckb-iq.js
+++ b/src/ngLocale/angular-locale_ckb-iq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u06be\u06d5\u06cc\u0646\u06cc",
       "\u0634\u06d5\u0645\u0645\u06d5"
     ],
+    "ERANAMES": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
+      "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
+    ],
+    "ERAS": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
+      "\u0632"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u0634\u0648\u0628\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "d\u06cc MMMM\u06cc y",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ckb-ir.js b/src/ngLocale/angular-locale_ckb-ir.js
index e7576ae5f40c..fb0bd006a461 100644
--- a/src/ngLocale/angular-locale_ckb-ir.js
+++ b/src/ngLocale/angular-locale_ckb-ir.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u06be\u06d5\u06cc\u0646\u06cc",
       "\u0634\u06d5\u0645\u0645\u06d5"
     ],
+    "ERANAMES": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
+      "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
+    ],
+    "ERAS": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
+      "\u0632"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u0634\u0648\u0628\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "d\u06cc MMMM\u06cc y",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ckb-latn-iq.js b/src/ngLocale/angular-locale_ckb-latn-iq.js
index e6fa19e3479b..4e3c8b79a932 100644
--- a/src/ngLocale/angular-locale_ckb-latn-iq.js
+++ b/src/ngLocale/angular-locale_ckb-latn-iq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u06be\u06d5\u06cc\u0646\u06cc",
       "\u0634\u06d5\u0645\u0645\u06d5"
     ],
+    "ERANAMES": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
+      "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
+    ],
+    "ERAS": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
+      "\u0632"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u0634\u0648\u0628\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "d\u06cc MMMM\u06cc y",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ckb-latn.js b/src/ngLocale/angular-locale_ckb-latn.js
index 6382fb98ad6b..e2a333fd12e0 100644
--- a/src/ngLocale/angular-locale_ckb-latn.js
+++ b/src/ngLocale/angular-locale_ckb-latn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u06be\u06d5\u06cc\u0646\u06cc",
       "\u0634\u06d5\u0645\u0645\u06d5"
     ],
+    "ERANAMES": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
+      "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
+    ],
+    "ERAS": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
+      "\u0632"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u0634\u0648\u0628\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "d\u06cc MMMM\u06cc y",
     "medium": "y MMM d HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "din",
     "DECIMAL_SEP": "\u066b",
     "GROUP_SEP": "\u066c",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ckb.js b/src/ngLocale/angular-locale_ckb.js
index 0f7e8ba8b70b..e03211228b8d 100644
--- a/src/ngLocale/angular-locale_ckb.js
+++ b/src/ngLocale/angular-locale_ckb.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u06be\u06d5\u06cc\u0646\u06cc",
       "\u0634\u06d5\u0645\u0645\u06d5"
     ],
+    "ERANAMES": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
+      "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
+    ],
+    "ERAS": [
+      "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
+      "\u0632"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u0634\u0648\u0628\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
       "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "d\u06cc MMMM\u06cc y",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_cs-cz.js b/src/ngLocale/angular-locale_cs-cz.js
index f86963a0ed4f..d260d8de365b 100644
--- a/src/ngLocale/angular-locale_cs-cz.js
+++ b/src/ngLocale/angular-locale_cs-cz.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "AM",
-      "PM"
+      "dopoledne",
+      "odpoledne"
     ],
     "DAY": [
       "ned\u011ble",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "p\u00e1tek",
       "sobota"
     ],
+    "ERANAMES": [
+      "p\u0159. n. l.",
+      "n. l."
+    ],
+    "ERAS": [
+      "p\u0159. n. l.",
+      "n. l."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ledna",
       "\u00fanora",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "lis",
       "pro"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. M. y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_cs.js b/src/ngLocale/angular-locale_cs.js
index b1b9a98a9421..3f9cb70e562f 100644
--- a/src/ngLocale/angular-locale_cs.js
+++ b/src/ngLocale/angular-locale_cs.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "AM",
-      "PM"
+      "dopoledne",
+      "odpoledne"
     ],
     "DAY": [
       "ned\u011ble",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "p\u00e1tek",
       "sobota"
     ],
+    "ERANAMES": [
+      "p\u0159. n. l.",
+      "n. l."
+    ],
+    "ERAS": [
+      "p\u0159. n. l.",
+      "n. l."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ledna",
       "\u00fanora",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "lis",
       "pro"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. M. y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_cy-gb.js b/src/ngLocale/angular-locale_cy-gb.js
index 6c96f5c6b25a..d6a9b5d7c0a3 100644
--- a/src/ngLocale/angular-locale_cy-gb.js
+++ b/src/ngLocale/angular-locale_cy-gb.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Dydd Gwener",
       "Dydd Sadwrn"
     ],
+    "ERANAMES": [
+      "Cyn Crist",
+      "Oed Crist"
+    ],
+    "ERAS": [
+      "CC",
+      "OC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ionawr",
       "Chwefror",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Tach",
       "Rhag"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_cy.js b/src/ngLocale/angular-locale_cy.js
index 18708b524af4..057a5278674f 100644
--- a/src/ngLocale/angular-locale_cy.js
+++ b/src/ngLocale/angular-locale_cy.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Dydd Gwener",
       "Dydd Sadwrn"
     ],
+    "ERANAMES": [
+      "Cyn Crist",
+      "Oed Crist"
+    ],
+    "ERAS": [
+      "CC",
+      "OC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ionawr",
       "Chwefror",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Tach",
       "Rhag"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_da-dk.js b/src/ngLocale/angular-locale_da-dk.js
index ddce855cfbb9..fe2f432a2362 100644
--- a/src/ngLocale/angular-locale_da-dk.js
+++ b/src/ngLocale/angular-locale_da-dk.js
@@ -47,6 +47,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f8rdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -84,13 +93,17 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE 'den' d. MMMM y",
     "longDate": "d. MMMM y",
-    "medium": "dd/MM/y HH.mm.ss",
-    "mediumDate": "dd/MM/y",
+    "medium": "d. MMM y HH.mm.ss",
+    "mediumDate": "d. MMM y",
     "mediumTime": "HH.mm.ss",
-    "short": "dd/MM/yy HH.mm",
-    "shortDate": "dd/MM/yy",
+    "short": "dd/MM/y HH.mm",
+    "shortDate": "dd/MM/y",
     "shortTime": "HH.mm"
   },
   "NUMBER_FORMATS": {
diff --git a/src/ngLocale/angular-locale_da-gl.js b/src/ngLocale/angular-locale_da-gl.js
index bd7133667fe9..9714d083279c 100644
--- a/src/ngLocale/angular-locale_da-gl.js
+++ b/src/ngLocale/angular-locale_da-gl.js
@@ -47,6 +47,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f8rdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -84,13 +93,17 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE 'den' d. MMMM y",
     "longDate": "d. MMMM y",
-    "medium": "dd/MM/y HH.mm.ss",
-    "mediumDate": "dd/MM/y",
+    "medium": "d. MMM y HH.mm.ss",
+    "mediumDate": "d. MMM y",
     "mediumTime": "HH.mm.ss",
-    "short": "dd/MM/yy HH.mm",
-    "shortDate": "dd/MM/yy",
+    "short": "dd/MM/y HH.mm",
+    "shortDate": "dd/MM/y",
     "shortTime": "HH.mm"
   },
   "NUMBER_FORMATS": {
diff --git a/src/ngLocale/angular-locale_da.js b/src/ngLocale/angular-locale_da.js
index ca257cc34a61..7e263cf9e48d 100644
--- a/src/ngLocale/angular-locale_da.js
+++ b/src/ngLocale/angular-locale_da.js
@@ -47,6 +47,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f8rdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -84,13 +93,17 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE 'den' d. MMMM y",
     "longDate": "d. MMMM y",
-    "medium": "dd/MM/y HH.mm.ss",
-    "mediumDate": "dd/MM/y",
+    "medium": "d. MMM y HH.mm.ss",
+    "mediumDate": "d. MMM y",
     "mediumTime": "HH.mm.ss",
-    "short": "dd/MM/yy HH.mm",
-    "shortDate": "dd/MM/yy",
+    "short": "dd/MM/y HH.mm",
+    "shortDate": "dd/MM/y",
     "shortTime": "HH.mm"
   },
   "NUMBER_FORMATS": {
diff --git a/src/ngLocale/angular-locale_dav-ke.js b/src/ngLocale/angular-locale_dav-ke.js
index 735446a1296b..4a689b5034c5 100644
--- a/src/ngLocale/angular-locale_dav-ke.js
+++ b/src/ngLocale/angular-locale_dav-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Kuramuka kasanu",
       "Kifula nguwo"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristo",
+      "Baada ya Kristo"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mori ghwa imbiri",
       "Mori ghwa kawi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Imw",
       "Iwi"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_dav.js b/src/ngLocale/angular-locale_dav.js
index a8fd6f73dab2..946c59f47b9d 100644
--- a/src/ngLocale/angular-locale_dav.js
+++ b/src/ngLocale/angular-locale_dav.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Kuramuka kasanu",
       "Kifula nguwo"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristo",
+      "Baada ya Kristo"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mori ghwa imbiri",
       "Mori ghwa kawi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Imw",
       "Iwi"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_de-at.js b/src/ngLocale/angular-locale_de-at.js
index 53c651bf8faa..b3ee8e15c924 100644
--- a/src/ngLocale/angular-locale_de-at.js
+++ b/src/ngLocale/angular-locale_de-at.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freitag",
       "Samstag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "J\u00e4nner",
       "Februar",
@@ -71,10 +80,14 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
-    "fullDate": "EEEE, dd. MMMM y",
-    "longDate": "dd. MMMM y",
-    "medium": "dd. MMM y HH:mm:ss",
-    "mediumDate": "dd. MMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d. MMMM y",
+    "longDate": "d. MMMM y",
+    "medium": "dd.MM.y HH:mm:ss",
+    "mediumDate": "dd.MM.y",
     "mediumTime": "HH:mm:ss",
     "short": "dd.MM.yy HH:mm",
     "shortDate": "dd.MM.yy",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_de-be.js b/src/ngLocale/angular-locale_de-be.js
index 5ef09466df96..61390da48ef0 100644
--- a/src/ngLocale/angular-locale_de-be.js
+++ b/src/ngLocale/angular-locale_de-be.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freitag",
       "Samstag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_de-ch.js b/src/ngLocale/angular-locale_de-ch.js
index 79ee0e58d156..cdb75cac24c4 100644
--- a/src/ngLocale/angular-locale_de-ch.js
+++ b/src/ngLocale/angular-locale_de-ch.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freitag",
       "Samstag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_de-de.js b/src/ngLocale/angular-locale_de-de.js
index 109f21459494..b69252f59d76 100644
--- a/src/ngLocale/angular-locale_de-de.js
+++ b/src/ngLocale/angular-locale_de-de.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freitag",
       "Samstag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_de-li.js b/src/ngLocale/angular-locale_de-li.js
index 932f46d17454..867e08d99c43 100644
--- a/src/ngLocale/angular-locale_de-li.js
+++ b/src/ngLocale/angular-locale_de-li.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freitag",
       "Samstag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_de-lu.js b/src/ngLocale/angular-locale_de-lu.js
index 3761086f281c..f141217c4104 100644
--- a/src/ngLocale/angular-locale_de-lu.js
+++ b/src/ngLocale/angular-locale_de-lu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freitag",
       "Samstag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_de.js b/src/ngLocale/angular-locale_de.js
index 61fd9f56b4e3..cbc6643fd5f9 100644
--- a/src/ngLocale/angular-locale_de.js
+++ b/src/ngLocale/angular-locale_de.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freitag",
       "Samstag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_dje-ne.js b/src/ngLocale/angular-locale_dje-ne.js
index 833f2617ed1d..a5f240337f91 100644
--- a/src/ngLocale/angular-locale_dje-ne.js
+++ b/src/ngLocale/angular-locale_dje-ne.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Alzuma",
       "Asibti"
     ],
+    "ERANAMES": [
+      "Isaa jine",
+      "Isaa zamanoo"
+    ],
+    "ERAS": [
+      "IJ",
+      "IZ"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u017danwiye",
       "Feewiriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Noo",
       "Dee"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_dje.js b/src/ngLocale/angular-locale_dje.js
index e098f079089c..630c9f4a8dbe 100644
--- a/src/ngLocale/angular-locale_dje.js
+++ b/src/ngLocale/angular-locale_dje.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Alzuma",
       "Asibti"
     ],
+    "ERANAMES": [
+      "Isaa jine",
+      "Isaa zamanoo"
+    ],
+    "ERAS": [
+      "IJ",
+      "IZ"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u017danwiye",
       "Feewiriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Noo",
       "Dee"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_dsb-de.js b/src/ngLocale/angular-locale_dsb-de.js
index 5601383c788f..8d7ca9f29342 100644
--- a/src/ngLocale/angular-locale_dsb-de.js
+++ b/src/ngLocale/angular-locale_dsb-de.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "p\u011btk",
       "sobota"
     ],
+    "ERANAMES": [
+      "p\u015bed Kristusowym naro\u017aenim",
+      "p\u00f3 Kristusowem naro\u017aenju"
+    ],
+    "ERAS": [
+      "p\u015b.Chr.n.",
+      "p\u00f3 Chr.n."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januara",
       "februara",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "now.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d.M.y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_dsb.js b/src/ngLocale/angular-locale_dsb.js
index 4cde28f2be51..f774a75b9449 100644
--- a/src/ngLocale/angular-locale_dsb.js
+++ b/src/ngLocale/angular-locale_dsb.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "p\u011btk",
       "sobota"
     ],
+    "ERANAMES": [
+      "p\u015bed Kristusowym naro\u017aenim",
+      "p\u00f3 Kristusowem naro\u017aenju"
+    ],
+    "ERAS": [
+      "p\u015b.Chr.n.",
+      "p\u00f3 Chr.n."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januara",
       "februara",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "now.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d.M.y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_dua-cm.js b/src/ngLocale/angular-locale_dua-cm.js
index 6dfdb108688d..84d780174695 100644
--- a/src/ngLocale/angular-locale_dua-cm.js
+++ b/src/ngLocale/angular-locale_dua-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0257\u00f3n\u025bs\u00fa",
       "esa\u0253as\u00fa"
     ],
+    "ERANAMES": [
+      "\u0253oso \u0253w\u00e1 y\u00e1\u0253e l\u00e1",
+      "mb\u00fasa kw\u00e9di a Y\u00e9s"
+    ],
+    "ERAS": [
+      "\u0253.Ys",
+      "mb.Ys"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "dim\u0254\u0301di",
       "\u014bg\u0254nd\u025b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "tin",
       "el\u00e1"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_dua.js b/src/ngLocale/angular-locale_dua.js
index 1ce52d57dcbd..c2ffe9450962 100644
--- a/src/ngLocale/angular-locale_dua.js
+++ b/src/ngLocale/angular-locale_dua.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0257\u00f3n\u025bs\u00fa",
       "esa\u0253as\u00fa"
     ],
+    "ERANAMES": [
+      "\u0253oso \u0253w\u00e1 y\u00e1\u0253e l\u00e1",
+      "mb\u00fasa kw\u00e9di a Y\u00e9s"
+    ],
+    "ERAS": [
+      "\u0253.Ys",
+      "mb.Ys"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "dim\u0254\u0301di",
       "\u014bg\u0254nd\u025b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "tin",
       "el\u00e1"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_dyo-sn.js b/src/ngLocale/angular-locale_dyo-sn.js
index 5b1fc06dec6f..e8fadc7142d7 100644
--- a/src/ngLocale/angular-locale_dyo-sn.js
+++ b/src/ngLocale/angular-locale_dyo-sn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Arjuma",
       "Sibiti"
     ],
+    "ERANAMES": [
+      "Ari\u014buu Yeesu",
+      "Atoo\u014be Yeesu"
+    ],
+    "ERAS": [
+      "ArY",
+      "AtY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Sanvie",
       "F\u00e9birie",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "No",
       "De"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_dyo.js b/src/ngLocale/angular-locale_dyo.js
index 0c801bf20da6..5699f4a208d3 100644
--- a/src/ngLocale/angular-locale_dyo.js
+++ b/src/ngLocale/angular-locale_dyo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Arjuma",
       "Sibiti"
     ],
+    "ERANAMES": [
+      "Ari\u014buu Yeesu",
+      "Atoo\u014be Yeesu"
+    ],
+    "ERAS": [
+      "ArY",
+      "AtY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Sanvie",
       "F\u00e9birie",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "No",
       "De"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_dz-bt.js b/src/ngLocale/angular-locale_dz-bt.js
index 170b25c0017c..c82e0508e19c 100644
--- a/src/ngLocale/angular-locale_dz-bt.js
+++ b/src/ngLocale/angular-locale_dz-bt.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0f42\u0f5f\u0f60\u0f0b\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b",
       "\u0f42\u0f5f\u0f60\u0f0b\u0f49\u0f72\u0f0b\u0f58\u0f0b"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0f5f\u0fb3\u0f0b\u0f51\u0f44\u0f54\u0f0b",
       "\u0f5f\u0fb3\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54\u0f0b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0f21\u0f21",
       "12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, \u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by MMMM \u0f5a\u0f7a\u0f66\u0f0bdd",
     "longDate": "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by MMMM \u0f5a\u0f7a\u0f66\u0f0b dd",
     "medium": "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by \u0f5f\u0fb3\u0f0bMMM \u0f5a\u0f7a\u0f66\u0f0bdd \u0f46\u0f74\u0f0b\u0f5a\u0f7c\u0f51\u0f0bh:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_dz.js b/src/ngLocale/angular-locale_dz.js
index aa926cf05609..3ef63d101331 100644
--- a/src/ngLocale/angular-locale_dz.js
+++ b/src/ngLocale/angular-locale_dz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0f42\u0f5f\u0f60\u0f0b\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b",
       "\u0f42\u0f5f\u0f60\u0f0b\u0f49\u0f72\u0f0b\u0f58\u0f0b"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0f5f\u0fb3\u0f0b\u0f51\u0f44\u0f54\u0f0b",
       "\u0f5f\u0fb3\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54\u0f0b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0f21\u0f21",
       "12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, \u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by MMMM \u0f5a\u0f7a\u0f66\u0f0bdd",
     "longDate": "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by MMMM \u0f5a\u0f7a\u0f66\u0f0b dd",
     "medium": "\u0f66\u0fa4\u0fb1\u0f72\u0f0b\u0f63\u0f7c\u0f0by \u0f5f\u0fb3\u0f0bMMM \u0f5a\u0f7a\u0f66\u0f0bdd \u0f46\u0f74\u0f0b\u0f5a\u0f7c\u0f51\u0f0bh:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ebu-ke.js b/src/ngLocale/angular-locale_ebu-ke.js
index 048333be3130..6f6761f1682f 100644
--- a/src/ngLocale/angular-locale_ebu-ke.js
+++ b/src/ngLocale/angular-locale_ebu-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Njumaa",
       "NJumamothii"
     ],
+    "ERANAMES": [
+      "Mbere ya Kristo",
+      "Thutha wa Kristo"
+    ],
+    "ERAS": [
+      "MK",
+      "TK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mweri wa mbere",
       "Mweri wa ka\u0129ri",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Imw",
       "Igi"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ebu.js b/src/ngLocale/angular-locale_ebu.js
index ff360066b6de..d92a16d2eb56 100644
--- a/src/ngLocale/angular-locale_ebu.js
+++ b/src/ngLocale/angular-locale_ebu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Njumaa",
       "NJumamothii"
     ],
+    "ERANAMES": [
+      "Mbere ya Kristo",
+      "Thutha wa Kristo"
+    ],
+    "ERAS": [
+      "MK",
+      "TK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mweri wa mbere",
       "Mweri wa ka\u0129ri",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Imw",
       "Igi"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ee-gh.js b/src/ngLocale/angular-locale_ee-gh.js
index b27d0552109b..16848babd55d 100644
--- a/src/ngLocale/angular-locale_ee-gh.js
+++ b/src/ngLocale/angular-locale_ee-gh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fi\u0256a",
       "memle\u0256a"
     ],
+    "ERANAMES": [
+      "Hafi Yesu Va Do \u014bg\u0254",
+      "Yesu \u014a\u0254li"
+    ],
+    "ERAS": [
+      "hY",
+      "Y\u014b"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "dzove",
       "dzodze",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ade",
       "dzm"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d 'lia' y",
     "longDate": "MMMM d 'lia' y",
     "medium": "MMM d 'lia', y a 'ga' h:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ee-tg.js b/src/ngLocale/angular-locale_ee-tg.js
index 1a6c3ee017da..de48746af9a7 100644
--- a/src/ngLocale/angular-locale_ee-tg.js
+++ b/src/ngLocale/angular-locale_ee-tg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fi\u0256a",
       "memle\u0256a"
     ],
+    "ERANAMES": [
+      "Hafi Yesu Va Do \u014bg\u0254",
+      "Yesu \u014a\u0254li"
+    ],
+    "ERAS": [
+      "hY",
+      "Y\u014b"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "dzove",
       "dzodze",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ade",
       "dzm"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d 'lia' y",
     "longDate": "MMMM d 'lia' y",
     "medium": "MMM d 'lia', y a 'ga' h:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ee.js b/src/ngLocale/angular-locale_ee.js
index 5aa0db880684..fdc03bebe12e 100644
--- a/src/ngLocale/angular-locale_ee.js
+++ b/src/ngLocale/angular-locale_ee.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fi\u0256a",
       "memle\u0256a"
     ],
+    "ERANAMES": [
+      "Hafi Yesu Va Do \u014bg\u0254",
+      "Yesu \u014a\u0254li"
+    ],
+    "ERAS": [
+      "hY",
+      "Y\u014b"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "dzove",
       "dzodze",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ade",
       "dzm"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d 'lia' y",
     "longDate": "MMMM d 'lia' y",
     "medium": "MMM d 'lia', y a 'ga' h:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_el-cy.js b/src/ngLocale/angular-locale_el-cy.js
index 3f9b398244de..5637d3fbb516 100644
--- a/src/ngLocale/angular-locale_el-cy.js
+++ b/src/ngLocale/angular-locale_el-cy.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae",
       "\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf"
     ],
+    "ERANAMES": [
+      "\u03c0\u03c1\u03bf \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03cd",
+      "\u03bc\u03b5\u03c4\u03ac \u03a7\u03c1\u03b9\u03c3\u03c4\u03cc\u03bd"
+    ],
+    "ERAS": [
+      "\u03c0.\u03a7.",
+      "\u03bc.\u03a7."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5",
       "\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u039d\u03bf\u03b5",
       "\u0394\u03b5\u03ba"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,10 +97,10 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
-        "negSuf": "",
-        "posPre": "\u00a4",
-        "posSuf": ""
+        "negPre": "-",
+        "negSuf": "\u00a0\u00a4",
+        "posPre": "",
+        "posSuf": "\u00a0\u00a4"
       }
     ]
   },
diff --git a/src/ngLocale/angular-locale_el-gr.js b/src/ngLocale/angular-locale_el-gr.js
index 8a5207645f74..72c8b719b93c 100644
--- a/src/ngLocale/angular-locale_el-gr.js
+++ b/src/ngLocale/angular-locale_el-gr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae",
       "\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf"
     ],
+    "ERANAMES": [
+      "\u03c0\u03c1\u03bf \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03cd",
+      "\u03bc\u03b5\u03c4\u03ac \u03a7\u03c1\u03b9\u03c3\u03c4\u03cc\u03bd"
+    ],
+    "ERAS": [
+      "\u03c0.\u03a7.",
+      "\u03bc.\u03a7."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5",
       "\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u039d\u03bf\u03b5",
       "\u0394\u03b5\u03ba"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_el.js b/src/ngLocale/angular-locale_el.js
index d01b664d656d..216542b8755e 100644
--- a/src/ngLocale/angular-locale_el.js
+++ b/src/ngLocale/angular-locale_el.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae",
       "\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf"
     ],
+    "ERANAMES": [
+      "\u03c0\u03c1\u03bf \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03cd",
+      "\u03bc\u03b5\u03c4\u03ac \u03a7\u03c1\u03b9\u03c3\u03c4\u03cc\u03bd"
+    ],
+    "ERAS": [
+      "\u03c0.\u03a7.",
+      "\u03bc.\u03a7."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5",
       "\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u039d\u03bf\u03b5",
       "\u0394\u03b5\u03ba"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_en-001.js b/src/ngLocale/angular-locale_en-001.js
index 7a598c0635a2..49c98073ee16 100644
--- a/src/ngLocale/angular-locale_en-001.js
+++ b/src/ngLocale/angular-locale_en-001.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-150.js b/src/ngLocale/angular-locale_en-150.js
index bb362029a8f8..88468dad963b 100644
--- a/src/ngLocale/angular-locale_en-150.js
+++ b/src/ngLocale/angular-locale_en-150.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE d MMMM y",
-    "longDate": "d MMM y",
-    "medium": "dd MMM y HH:mm:ss",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "dd MMM y h:mm:ss a",
     "mediumDate": "dd MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/yy HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/yy h:mm a",
     "shortDate": "dd/MM/yy",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "$",
diff --git a/src/ngLocale/angular-locale_en-ag.js b/src/ngLocale/angular-locale_en-ag.js
index 4e2982ca0cc6..effeae65f98e 100644
--- a/src/ngLocale/angular-locale_en-ag.js
+++ b/src/ngLocale/angular-locale_en-ag.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ai.js b/src/ngLocale/angular-locale_en-ai.js
index 235d3103be05..29a39cb3f435 100644
--- a/src/ngLocale/angular-locale_en-ai.js
+++ b/src/ngLocale/angular-locale_en-ai.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-as.js b/src/ngLocale/angular-locale_en-as.js
index 9974a918d7cd..b121ecba99a4 100644
--- a/src/ngLocale/angular-locale_en-as.js
+++ b/src/ngLocale/angular-locale_en-as.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-au.js b/src/ngLocale/angular-locale_en-au.js
index 0cd27dbd628b..a1ea9d768df9 100644
--- a/src/ngLocale/angular-locale_en-au.js
+++ b/src/ngLocale/angular-locale_en-au.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-bb.js b/src/ngLocale/angular-locale_en-bb.js
index f538fe10852b..a183bab22fd3 100644
--- a/src/ngLocale/angular-locale_en-bb.js
+++ b/src/ngLocale/angular-locale_en-bb.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-be.js b/src/ngLocale/angular-locale_en-be.js
index 8fc40941619f..8a79877f11ce 100644
--- a/src/ngLocale/angular-locale_en-be.js
+++ b/src/ngLocale/angular-locale_en-be.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE d MMMM y",
-    "longDate": "d MMM y",
-    "medium": "dd MMM y HH:mm:ss",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "dd MMM y h:mm:ss a",
     "mediumDate": "dd MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/yy HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/yy h:mm a",
     "shortDate": "dd/MM/yy",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u20ac",
diff --git a/src/ngLocale/angular-locale_en-bm.js b/src/ngLocale/angular-locale_en-bm.js
index 361d5958a799..217c162feee0 100644
--- a/src/ngLocale/angular-locale_en-bm.js
+++ b/src/ngLocale/angular-locale_en-bm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-bs.js b/src/ngLocale/angular-locale_en-bs.js
index 388927cb0499..dfcf301ede08 100644
--- a/src/ngLocale/angular-locale_en-bs.js
+++ b/src/ngLocale/angular-locale_en-bs.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-bw.js b/src/ngLocale/angular-locale_en-bw.js
index b06c56259120..9433a32d580c 100644
--- a/src/ngLocale/angular-locale_en-bw.js
+++ b/src/ngLocale/angular-locale_en-bw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,7 +80,11 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE dd MMMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "dd MMM y h:mm:ss a",
     "mediumDate": "dd MMM y",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-bz.js b/src/ngLocale/angular-locale_en-bz.js
index bdc968b69adc..50b70783ce88 100644
--- a/src/ngLocale/angular-locale_en-bz.js
+++ b/src/ngLocale/angular-locale_en-bz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,7 +80,11 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE dd MMMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y HH:mm:ss",
     "mediumDate": "dd-MMM-y",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ca.js b/src/ngLocale/angular-locale_en-ca.js
index ef39418532c8..5ca0d1d3cc86 100644
--- a/src/ngLocale/angular-locale_en-ca.js
+++ b/src/ngLocale/angular-locale_en-ca.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-cc.js b/src/ngLocale/angular-locale_en-cc.js
index 0a1b27988c1a..e840c699a787 100644
--- a/src/ngLocale/angular-locale_en-cc.js
+++ b/src/ngLocale/angular-locale_en-cc.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ck.js b/src/ngLocale/angular-locale_en-ck.js
index 42f00dfbad69..5cdb9138f5d3 100644
--- a/src/ngLocale/angular-locale_en-ck.js
+++ b/src/ngLocale/angular-locale_en-ck.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-cm.js b/src/ngLocale/angular-locale_en-cm.js
index 49d7e8c29211..06821311db97 100644
--- a/src/ngLocale/angular-locale_en-cm.js
+++ b/src/ngLocale/angular-locale_en-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-cx.js b/src/ngLocale/angular-locale_en-cx.js
index 38a2e7351575..e6c4f1064706 100644
--- a/src/ngLocale/angular-locale_en-cx.js
+++ b/src/ngLocale/angular-locale_en-cx.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-dg.js b/src/ngLocale/angular-locale_en-dg.js
index 56dacaae7ade..6c2c605f02e6 100644
--- a/src/ngLocale/angular-locale_en-dg.js
+++ b/src/ngLocale/angular-locale_en-dg.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "$",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-dm.js b/src/ngLocale/angular-locale_en-dm.js
index 762b1e8c9e86..7225a1dd200c 100644
--- a/src/ngLocale/angular-locale_en-dm.js
+++ b/src/ngLocale/angular-locale_en-dm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-er.js b/src/ngLocale/angular-locale_en-er.js
index d9ed431b0ac7..85232a6abbbf 100644
--- a/src/ngLocale/angular-locale_en-er.js
+++ b/src/ngLocale/angular-locale_en-er.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-fj.js b/src/ngLocale/angular-locale_en-fj.js
index 8de0a7683141..a7dfbe685cc4 100644
--- a/src/ngLocale/angular-locale_en-fj.js
+++ b/src/ngLocale/angular-locale_en-fj.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-fk.js b/src/ngLocale/angular-locale_en-fk.js
index 4a9af0d1479b..5da1bcb87139 100644
--- a/src/ngLocale/angular-locale_en-fk.js
+++ b/src/ngLocale/angular-locale_en-fk.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u00a3",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-fm.js b/src/ngLocale/angular-locale_en-fm.js
index 20ce533313d5..19cfa0559baf 100644
--- a/src/ngLocale/angular-locale_en-fm.js
+++ b/src/ngLocale/angular-locale_en-fm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-gb.js b/src/ngLocale/angular-locale_en-gb.js
index 5c12bf56a9f0..3eb37db23f48 100644
--- a/src/ngLocale/angular-locale_en-gb.js
+++ b/src/ngLocale/angular-locale_en-gb.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "a.m.",
+      "p.m."
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-gd.js b/src/ngLocale/angular-locale_en-gd.js
index a583526c28b5..4fbcd1c31bfb 100644
--- a/src/ngLocale/angular-locale_en-gd.js
+++ b/src/ngLocale/angular-locale_en-gd.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-gg.js b/src/ngLocale/angular-locale_en-gg.js
index a7dbbe058f78..8da65cc0eab3 100644
--- a/src/ngLocale/angular-locale_en-gg.js
+++ b/src/ngLocale/angular-locale_en-gg.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u00a3",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-gh.js b/src/ngLocale/angular-locale_en-gh.js
index 5cbda2ad1331..bcaa1bccef03 100644
--- a/src/ngLocale/angular-locale_en-gh.js
+++ b/src/ngLocale/angular-locale_en-gh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-gi.js b/src/ngLocale/angular-locale_en-gi.js
index cef1470ba12b..926bacd0382f 100644
--- a/src/ngLocale/angular-locale_en-gi.js
+++ b/src/ngLocale/angular-locale_en-gi.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u00a3",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-gm.js b/src/ngLocale/angular-locale_en-gm.js
index c0ed3487405b..fec1b6041c6c 100644
--- a/src/ngLocale/angular-locale_en-gm.js
+++ b/src/ngLocale/angular-locale_en-gm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-gu.js b/src/ngLocale/angular-locale_en-gu.js
index b5846fbe4130..68d66d51567e 100644
--- a/src/ngLocale/angular-locale_en-gu.js
+++ b/src/ngLocale/angular-locale_en-gu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-gy.js b/src/ngLocale/angular-locale_en-gy.js
index 4f23b884da14..405cfc39f5b9 100644
--- a/src/ngLocale/angular-locale_en-gy.js
+++ b/src/ngLocale/angular-locale_en-gy.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-hk.js b/src/ngLocale/angular-locale_en-hk.js
index d754ed05d849..6efd69245c06 100644
--- a/src/ngLocale/angular-locale_en-hk.js
+++ b/src/ngLocale/angular-locale_en-hk.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ie.js b/src/ngLocale/angular-locale_en-ie.js
index 16caaa6383c4..d6eb9505d938 100644
--- a/src/ngLocale/angular-locale_en-ie.js
+++ b/src/ngLocale/angular-locale_en-ie.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u20ac",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-im.js b/src/ngLocale/angular-locale_en-im.js
index a5cf5bb78bd5..b9d1717c8965 100644
--- a/src/ngLocale/angular-locale_en-im.js
+++ b/src/ngLocale/angular-locale_en-im.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u00a3",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-in.js b/src/ngLocale/angular-locale_en-in.js
index 302a941c8c5e..050ef178c862 100644
--- a/src/ngLocale/angular-locale_en-in.js
+++ b/src/ngLocale/angular-locale_en-in.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-io.js b/src/ngLocale/angular-locale_en-io.js
index c58f045c8ee3..3e0cc47fefb0 100644
--- a/src/ngLocale/angular-locale_en-io.js
+++ b/src/ngLocale/angular-locale_en-io.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "$",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-iso.js b/src/ngLocale/angular-locale_en-iso.js
index 72386bbc037d..4e1ba795fa96 100644
--- a/src/ngLocale/angular-locale_en-iso.js
+++ b/src/ngLocale/angular-locale_en-iso.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-je.js b/src/ngLocale/angular-locale_en-je.js
index 3a8c79c81ff0..6883396c36bd 100644
--- a/src/ngLocale/angular-locale_en-je.js
+++ b/src/ngLocale/angular-locale_en-je.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u00a3",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-jm.js b/src/ngLocale/angular-locale_en-jm.js
index a2a74bddde0b..080daec15972 100644
--- a/src/ngLocale/angular-locale_en-jm.js
+++ b/src/ngLocale/angular-locale_en-jm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,10 +80,14 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ke.js b/src/ngLocale/angular-locale_en-ke.js
index c56cb53d5153..e0e16af63e49 100644
--- a/src/ngLocale/angular-locale_en-ke.js
+++ b/src/ngLocale/angular-locale_en-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ki.js b/src/ngLocale/angular-locale_en-ki.js
index 1f36edd659c9..de6c4ff539ca 100644
--- a/src/ngLocale/angular-locale_en-ki.js
+++ b/src/ngLocale/angular-locale_en-ki.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-kn.js b/src/ngLocale/angular-locale_en-kn.js
index a5ca93b5ed66..88f8d651e6c5 100644
--- a/src/ngLocale/angular-locale_en-kn.js
+++ b/src/ngLocale/angular-locale_en-kn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ky.js b/src/ngLocale/angular-locale_en-ky.js
index f443e425da0c..f19fdb76fb9c 100644
--- a/src/ngLocale/angular-locale_en-ky.js
+++ b/src/ngLocale/angular-locale_en-ky.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-lc.js b/src/ngLocale/angular-locale_en-lc.js
index e1305d38e5bb..cf95b8313742 100644
--- a/src/ngLocale/angular-locale_en-lc.js
+++ b/src/ngLocale/angular-locale_en-lc.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-lr.js b/src/ngLocale/angular-locale_en-lr.js
index c7560852f075..87c7c8c505b5 100644
--- a/src/ngLocale/angular-locale_en-lr.js
+++ b/src/ngLocale/angular-locale_en-lr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ls.js b/src/ngLocale/angular-locale_en-ls.js
index 52bb1a2a472e..08575f9e3a26 100644
--- a/src/ngLocale/angular-locale_en-ls.js
+++ b/src/ngLocale/angular-locale_en-ls.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-mg.js b/src/ngLocale/angular-locale_en-mg.js
index b55fa010cec3..10c070ab505b 100644
--- a/src/ngLocale/angular-locale_en-mg.js
+++ b/src/ngLocale/angular-locale_en-mg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-mh.js b/src/ngLocale/angular-locale_en-mh.js
index da5f86d20be3..3ec0b3d4e37f 100644
--- a/src/ngLocale/angular-locale_en-mh.js
+++ b/src/ngLocale/angular-locale_en-mh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-mo.js b/src/ngLocale/angular-locale_en-mo.js
index 816edf00d5c8..e56ec63ccd55 100644
--- a/src/ngLocale/angular-locale_en-mo.js
+++ b/src/ngLocale/angular-locale_en-mo.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "MOP",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-mp.js b/src/ngLocale/angular-locale_en-mp.js
index a123093f7474..1d830bf7659e 100644
--- a/src/ngLocale/angular-locale_en-mp.js
+++ b/src/ngLocale/angular-locale_en-mp.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ms.js b/src/ngLocale/angular-locale_en-ms.js
index b9506dee12bf..599a03fe2423 100644
--- a/src/ngLocale/angular-locale_en-ms.js
+++ b/src/ngLocale/angular-locale_en-ms.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-mt.js b/src/ngLocale/angular-locale_en-mt.js
index 0b8eb3ef28b3..05818a8bd396 100644
--- a/src/ngLocale/angular-locale_en-mt.js
+++ b/src/ngLocale/angular-locale_en-mt.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "dd MMMM y",
-    "medium": "dd MMM y HH:mm:ss",
+    "medium": "dd MMM y h:mm:ss a",
     "mediumDate": "dd MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u20ac",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-mu.js b/src/ngLocale/angular-locale_en-mu.js
index a0fcf2a717c9..37e64915c3e9 100644
--- a/src/ngLocale/angular-locale_en-mu.js
+++ b/src/ngLocale/angular-locale_en-mu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-mw.js b/src/ngLocale/angular-locale_en-mw.js
index a22686c1268f..d850392cd0c5 100644
--- a/src/ngLocale/angular-locale_en-mw.js
+++ b/src/ngLocale/angular-locale_en-mw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-my.js b/src/ngLocale/angular-locale_en-my.js
index 083838c01e50..f02af2816d32 100644
--- a/src/ngLocale/angular-locale_en-my.js
+++ b/src/ngLocale/angular-locale_en-my.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-na.js b/src/ngLocale/angular-locale_en-na.js
index b9f55dcd7b21..13dc95aab7e5 100644
--- a/src/ngLocale/angular-locale_en-na.js
+++ b/src/ngLocale/angular-locale_en-na.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-nf.js b/src/ngLocale/angular-locale_en-nf.js
index 6fac4fe08991..72154ecbf7a4 100644
--- a/src/ngLocale/angular-locale_en-nf.js
+++ b/src/ngLocale/angular-locale_en-nf.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ng.js b/src/ngLocale/angular-locale_en-ng.js
index 7b7dbb7c6f85..3f506f47c1fb 100644
--- a/src/ngLocale/angular-locale_en-ng.js
+++ b/src/ngLocale/angular-locale_en-ng.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-nr.js b/src/ngLocale/angular-locale_en-nr.js
index 9633913101e0..fb7e1319e14f 100644
--- a/src/ngLocale/angular-locale_en-nr.js
+++ b/src/ngLocale/angular-locale_en-nr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-nu.js b/src/ngLocale/angular-locale_en-nu.js
index 38578abbaba0..3ff530dd707a 100644
--- a/src/ngLocale/angular-locale_en-nu.js
+++ b/src/ngLocale/angular-locale_en-nu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-nz.js b/src/ngLocale/angular-locale_en-nz.js
index 1b38701f8ee6..b0c2ce077021 100644
--- a/src/ngLocale/angular-locale_en-nz.js
+++ b/src/ngLocale/angular-locale_en-nz.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d/MM/y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-pg.js b/src/ngLocale/angular-locale_en-pg.js
index c47027cab113..e43790574667 100644
--- a/src/ngLocale/angular-locale_en-pg.js
+++ b/src/ngLocale/angular-locale_en-pg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ph.js b/src/ngLocale/angular-locale_en-ph.js
index 6ac235a0f402..a1ae7ea8dbe5 100644
--- a/src/ngLocale/angular-locale_en-ph.js
+++ b/src/ngLocale/angular-locale_en-ph.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-pk.js b/src/ngLocale/angular-locale_en-pk.js
index 92b256762588..4d99a3e60f7a 100644
--- a/src/ngLocale/angular-locale_en-pk.js
+++ b/src/ngLocale/angular-locale_en-pk.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,7 +80,11 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE d MMMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
     "mediumDate": "dd-MMM-y",
@@ -86,7 +99,7 @@ $provide.value("$locale", {
     "GROUP_SEP": ",",
     "PATTERNS": [
       {
-        "gSize": 2,
+        "gSize": 3,
         "lgSize": 3,
         "maxFrac": 3,
         "minFrac": 0,
@@ -97,14 +110,14 @@ $provide.value("$locale", {
         "posSuf": ""
       },
       {
-        "gSize": 2,
+        "gSize": 3,
         "lgSize": 3,
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4",
         "negSuf": "",
-        "posPre": "\u00a4\u00a0",
+        "posPre": "\u00a4",
         "posSuf": ""
       }
     ]
diff --git a/src/ngLocale/angular-locale_en-pn.js b/src/ngLocale/angular-locale_en-pn.js
index f089133c77ca..460e76ab849a 100644
--- a/src/ngLocale/angular-locale_en-pn.js
+++ b/src/ngLocale/angular-locale_en-pn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-pr.js b/src/ngLocale/angular-locale_en-pr.js
index 23e6eb1f30a5..5a2e9ef59615 100644
--- a/src/ngLocale/angular-locale_en-pr.js
+++ b/src/ngLocale/angular-locale_en-pr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-pw.js b/src/ngLocale/angular-locale_en-pw.js
index 4083deb77274..5be685814243 100644
--- a/src/ngLocale/angular-locale_en-pw.js
+++ b/src/ngLocale/angular-locale_en-pw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-rw.js b/src/ngLocale/angular-locale_en-rw.js
index 88426daf6cfd..477fe01e1177 100644
--- a/src/ngLocale/angular-locale_en-rw.js
+++ b/src/ngLocale/angular-locale_en-rw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-sb.js b/src/ngLocale/angular-locale_en-sb.js
index 3692838bd04d..4f195c03084b 100644
--- a/src/ngLocale/angular-locale_en-sb.js
+++ b/src/ngLocale/angular-locale_en-sb.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-sc.js b/src/ngLocale/angular-locale_en-sc.js
index bc00e189a5d4..c77368e42b3c 100644
--- a/src/ngLocale/angular-locale_en-sc.js
+++ b/src/ngLocale/angular-locale_en-sc.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-sd.js b/src/ngLocale/angular-locale_en-sd.js
index c4f4a862d44c..642fed131e0c 100644
--- a/src/ngLocale/angular-locale_en-sd.js
+++ b/src/ngLocale/angular-locale_en-sd.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-sg.js b/src/ngLocale/angular-locale_en-sg.js
index fa0ba7849034..9a573044f96d 100644
--- a/src/ngLocale/angular-locale_en-sg.js
+++ b/src/ngLocale/angular-locale_en-sg.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-sh.js b/src/ngLocale/angular-locale_en-sh.js
index 2e8587302348..f44ca8a1c861 100644
--- a/src/ngLocale/angular-locale_en-sh.js
+++ b/src/ngLocale/angular-locale_en-sh.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u00a3",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-sl.js b/src/ngLocale/angular-locale_en-sl.js
index fab7c3af412b..c66cc354acd3 100644
--- a/src/ngLocale/angular-locale_en-sl.js
+++ b/src/ngLocale/angular-locale_en-sl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ss.js b/src/ngLocale/angular-locale_en-ss.js
index de0eadc43e61..8c0e69477230 100644
--- a/src/ngLocale/angular-locale_en-ss.js
+++ b/src/ngLocale/angular-locale_en-ss.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,17 +80,21 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "SSP",
+    "CURRENCY_SYM": "\u00a3",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-sx.js b/src/ngLocale/angular-locale_en-sx.js
index faba78f14d73..b84c964f65cf 100644
--- a/src/ngLocale/angular-locale_en-sx.js
+++ b/src/ngLocale/angular-locale_en-sx.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,17 +80,21 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "ANG",
+    "CURRENCY_SYM": "NAf.",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-sz.js b/src/ngLocale/angular-locale_en-sz.js
index 7c437941198c..5dc361c01af6 100644
--- a/src/ngLocale/angular-locale_en-sz.js
+++ b/src/ngLocale/angular-locale_en-sz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-tc.js b/src/ngLocale/angular-locale_en-tc.js
index 6b881bdd42a8..d075f25c7fb8 100644
--- a/src/ngLocale/angular-locale_en-tc.js
+++ b/src/ngLocale/angular-locale_en-tc.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-tk.js b/src/ngLocale/angular-locale_en-tk.js
index f9b73741f6df..048c92565be0 100644
--- a/src/ngLocale/angular-locale_en-tk.js
+++ b/src/ngLocale/angular-locale_en-tk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-to.js b/src/ngLocale/angular-locale_en-to.js
index 6a859cb87e72..a208e5212f74 100644
--- a/src/ngLocale/angular-locale_en-to.js
+++ b/src/ngLocale/angular-locale_en-to.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-tt.js b/src/ngLocale/angular-locale_en-tt.js
index cb22b1793480..c10e2eea2bac 100644
--- a/src/ngLocale/angular-locale_en-tt.js
+++ b/src/ngLocale/angular-locale_en-tt.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-tv.js b/src/ngLocale/angular-locale_en-tv.js
index 44005fe4a638..32c7a2c83837 100644
--- a/src/ngLocale/angular-locale_en-tv.js
+++ b/src/ngLocale/angular-locale_en-tv.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-tz.js b/src/ngLocale/angular-locale_en-tz.js
index f68f0a518060..488954d719a4 100644
--- a/src/ngLocale/angular-locale_en-tz.js
+++ b/src/ngLocale/angular-locale_en-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ug.js b/src/ngLocale/angular-locale_en-ug.js
index 02f012c3ad66..9cde496b662c 100644
--- a/src/ngLocale/angular-locale_en-ug.js
+++ b/src/ngLocale/angular-locale_en-ug.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-um.js b/src/ngLocale/angular-locale_en-um.js
index 5fcf52a01ae8..827b56c1b662 100644
--- a/src/ngLocale/angular-locale_en-um.js
+++ b/src/ngLocale/angular-locale_en-um.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-us.js b/src/ngLocale/angular-locale_en-us.js
index 6ca9e4f42c03..9a9bfe8263dd 100644
--- a/src/ngLocale/angular-locale_en-us.js
+++ b/src/ngLocale/angular-locale_en-us.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-vc.js b/src/ngLocale/angular-locale_en-vc.js
index bb38ca7ba7f2..f9c1ab9b3bc8 100644
--- a/src/ngLocale/angular-locale_en-vc.js
+++ b/src/ngLocale/angular-locale_en-vc.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-vg.js b/src/ngLocale/angular-locale_en-vg.js
index 547a0c7f1334..74fabbf873f1 100644
--- a/src/ngLocale/angular-locale_en-vg.js
+++ b/src/ngLocale/angular-locale_en-vg.js
@@ -22,8 +22,8 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "am",
-      "pm"
+      "AM",
+      "PM"
     ],
     "DAY": [
       "Sunday",
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
+    "medium": "d MMM y h:mm:ss a",
     "mediumDate": "d MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "dd/MM/y HH:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/y h:mm a",
     "shortDate": "dd/MM/y",
-    "shortTime": "HH:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "$",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-vi.js b/src/ngLocale/angular-locale_en-vi.js
index d0c27516c02e..3d02ce57d718 100644
--- a/src/ngLocale/angular-locale_en-vi.js
+++ b/src/ngLocale/angular-locale_en-vi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-vu.js b/src/ngLocale/angular-locale_en-vu.js
index 252ce47ad893..a9f6a6ac9284 100644
--- a/src/ngLocale/angular-locale_en-vu.js
+++ b/src/ngLocale/angular-locale_en-vu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-ws.js b/src/ngLocale/angular-locale_en-ws.js
index 3530e90bbb08..49d0931e35e3 100644
--- a/src/ngLocale/angular-locale_en-ws.js
+++ b/src/ngLocale/angular-locale_en-ws.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-za.js b/src/ngLocale/angular-locale_en-za.js
index 6e61d891d111..56283c80aca9 100644
--- a/src/ngLocale/angular-locale_en-za.js
+++ b/src/ngLocale/angular-locale_en-za.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,7 +80,11 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE dd MMMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "dd MMM y h:mm:ss a",
     "mediumDate": "dd MMM y",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-zm.js b/src/ngLocale/angular-locale_en-zm.js
index 718b8ff4b4e8..78a5cd99319a 100644
--- a/src/ngLocale/angular-locale_en-zm.js
+++ b/src/ngLocale/angular-locale_en-zm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "January",
       "February",
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE, MMMM d, y",
-    "longDate": "MMMM d, y",
-    "medium": "MMM d, y h:mm:ss a",
-    "mediumDate": "MMM d, y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
-    "short": "M/d/yy h:mm a",
-    "shortDate": "M/d/yy",
+    "short": "dd/MM/y h:mm a",
+    "shortDate": "dd/MM/y",
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en-zw.js b/src/ngLocale/angular-locale_en-zw.js
index 0cf7160b638a..84125681b16a 100644
--- a/src/ngLocale/angular-locale_en-zw.js
+++ b/src/ngLocale/angular-locale_en-zw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,7 +80,11 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
-    "fullDate": "EEEE dd MMMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "dd MMM,y h:mm:ss a",
     "mediumDate": "dd MMM,y",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_en.js b/src/ngLocale/angular-locale_en.js
index 7c5e8d2f03c9..55076c8432c8 100644
--- a/src/ngLocale/angular-locale_en.js
+++ b/src/ngLocale/angular-locale_en.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friday",
       "Saturday"
     ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "January",
       "February",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_eo-001.js b/src/ngLocale/angular-locale_eo-001.js
index fbb83541dfb4..4a153257fdcd 100644
--- a/src/ngLocale/angular-locale_eo-001.js
+++ b/src/ngLocale/angular-locale_eo-001.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vendredo",
       "sabato"
     ],
+    "ERANAMES": [
+      "aK",
+      "pK"
+    ],
+    "ERAS": [
+      "aK",
+      "pK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januaro",
       "februaro",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d-'a' 'de' MMMM y",
     "longDate": "y-MMMM-dd",
     "medium": "y-MMM-dd HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_eo.js b/src/ngLocale/angular-locale_eo.js
index 8a0d5918009b..b70d7a05c627 100644
--- a/src/ngLocale/angular-locale_eo.js
+++ b/src/ngLocale/angular-locale_eo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vendredo",
       "sabato"
     ],
+    "ERANAMES": [
+      "aK",
+      "pK"
+    ],
+    "ERAS": [
+      "aK",
+      "pK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januaro",
       "februaro",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d-'a' 'de' MMMM y",
     "longDate": "y-MMMM-dd",
     "medium": "y-MMM-dd HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-419.js b/src/ngLocale/angular-locale_es-419.js
index fe3022f38b1b..00dcab26495e 100644
--- a/src/ngLocale/angular-locale_es-419.js
+++ b/src/ngLocale/angular-locale_es-419.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-ar.js b/src/ngLocale/angular-locale_es-ar.js
index 29a20887cf8b..155dfad9fb4b 100644
--- a/src/ngLocale/angular-locale_es-ar.js
+++ b/src/ngLocale/angular-locale_es-ar.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-bo.js b/src/ngLocale/angular-locale_es-bo.js
index ead66e4ec2ba..b7aa597b07ca 100644
--- a/src/ngLocale/angular-locale_es-bo.js
+++ b/src/ngLocale/angular-locale_es-bo.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-cl.js b/src/ngLocale/angular-locale_es-cl.js
index 461ac29ef33a..2b4a8a5a5b7c 100644
--- a/src/ngLocale/angular-locale_es-cl.js
+++ b/src/ngLocale/angular-locale_es-cl.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,11 +57,15 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd-MM-y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_es-co.js b/src/ngLocale/angular-locale_es-co.js
index cf4475471d98..46b4d6bf586f 100644
--- a/src/ngLocale/angular-locale_es-co.js
+++ b/src/ngLocale/angular-locale_es-co.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,11 +57,15 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "d/MM/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-cr.js b/src/ngLocale/angular-locale_es-cr.js
index 5682e9b07cb8..42927de91534 100644
--- a/src/ngLocale/angular-locale_es-cr.js
+++ b/src/ngLocale/angular-locale_es-cr.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-cu.js b/src/ngLocale/angular-locale_es-cu.js
index cd49522ad976..ec16c71b55fc 100644
--- a/src/ngLocale/angular-locale_es-cu.js
+++ b/src/ngLocale/angular-locale_es-cu.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-do.js b/src/ngLocale/angular-locale_es-do.js
index ddb4b41d5a89..beedf8a3b2d4 100644
--- a/src/ngLocale/angular-locale_es-do.js
+++ b/src/ngLocale/angular-locale_es-do.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-ea.js b/src/ngLocale/angular-locale_es-ea.js
index cc1684c0cb65..ffefb9d1731e 100644
--- a/src/ngLocale/angular-locale_es-ea.js
+++ b/src/ngLocale/angular-locale_es-ea.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y H:mm:ss",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y H:mm:ss",
+    "mediumDate": "d MMM y",
     "mediumTime": "H:mm:ss",
     "short": "d/M/yy H:mm",
     "shortDate": "d/M/yy",
diff --git a/src/ngLocale/angular-locale_es-ec.js b/src/ngLocale/angular-locale_es-ec.js
index 27b09388b76a..10949c127abe 100644
--- a/src/ngLocale/angular-locale_es-ec.js
+++ b/src/ngLocale/angular-locale_es-ec.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
diff --git a/src/ngLocale/angular-locale_es-es.js b/src/ngLocale/angular-locale_es-es.js
index 2d6893358915..9d0eb6569649 100644
--- a/src/ngLocale/angular-locale_es-es.js
+++ b/src/ngLocale/angular-locale_es-es.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y H:mm:ss",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y H:mm:ss",
+    "mediumDate": "d MMM y",
     "mediumTime": "H:mm:ss",
     "short": "d/M/yy H:mm",
     "shortDate": "d/M/yy",
diff --git a/src/ngLocale/angular-locale_es-gq.js b/src/ngLocale/angular-locale_es-gq.js
index b274cbff0491..d8fcd4b7c281 100644
--- a/src/ngLocale/angular-locale_es-gq.js
+++ b/src/ngLocale/angular-locale_es-gq.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y H:mm:ss",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y H:mm:ss",
+    "mediumDate": "d MMM y",
     "mediumTime": "H:mm:ss",
     "short": "d/M/yy H:mm",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-gt.js b/src/ngLocale/angular-locale_es-gt.js
index 0e9b86f0df92..e9b27cc00d6d 100644
--- a/src/ngLocale/angular-locale_es-gt.js
+++ b/src/ngLocale/angular-locale_es-gt.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,11 +57,15 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "d/MM/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-hn.js b/src/ngLocale/angular-locale_es-hn.js
index dff7efd41b4b..1fc839e6ed75 100644
--- a/src/ngLocale/angular-locale_es-hn.js
+++ b/src/ngLocale/angular-locale_es-hn.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd 'de' MMMM 'de' y",
     "longDate": "dd 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-ic.js b/src/ngLocale/angular-locale_es-ic.js
index 468afbe46d73..10987395850a 100644
--- a/src/ngLocale/angular-locale_es-ic.js
+++ b/src/ngLocale/angular-locale_es-ic.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y H:mm:ss",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y H:mm:ss",
+    "mediumDate": "d MMM y",
     "mediumTime": "H:mm:ss",
     "short": "d/M/yy H:mm",
     "shortDate": "d/M/yy",
diff --git a/src/ngLocale/angular-locale_es-mx.js b/src/ngLocale/angular-locale_es-mx.js
index a3d99aa07df4..95eb1456017b 100644
--- a/src/ngLocale/angular-locale_es-mx.js
+++ b/src/ngLocale/angular-locale_es-mx.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -31,13 +40,13 @@ $provide.value("$locale", {
       "diciembre"
     ],
     "SHORTDAY": [
-      "dom",
-      "lun",
-      "mar",
-      "mi\u00e9",
-      "jue",
-      "vie",
-      "s\u00e1b"
+      "dom.",
+      "lun.",
+      "mar.",
+      "mi\u00e9.",
+      "jue.",
+      "vie.",
+      "s\u00e1b."
     ],
     "SHORTMONTH": [
       "ene",
@@ -53,14 +62,18 @@ $provide.value("$locale", {
       "nov",
       "dic"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "dd/MM/y H:mm:ss",
+    "medium": "dd/MM/y h:mm:ss a",
     "mediumDate": "dd/MM/y",
-    "mediumTime": "H:mm:ss",
-    "short": "dd/MM/yy H:mm",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/yy h:mm a",
     "shortDate": "dd/MM/yy",
-    "shortTime": "H:mm"
+    "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "$",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-ni.js b/src/ngLocale/angular-locale_es-ni.js
index 5f5f596691ae..775fb5fdfbcc 100644
--- a/src/ngLocale/angular-locale_es-ni.js
+++ b/src/ngLocale/angular-locale_es-ni.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-pa.js b/src/ngLocale/angular-locale_es-pa.js
index 543aab195fe6..141605ed5105 100644
--- a/src/ngLocale/angular-locale_es-pa.js
+++ b/src/ngLocale/angular-locale_es-pa.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,11 +57,15 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "MM/dd/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-pe.js b/src/ngLocale/angular-locale_es-pe.js
index 39297d94ab3c..ea7dfd229d58 100644
--- a/src/ngLocale/angular-locale_es-pe.js
+++ b/src/ngLocale/angular-locale_es-pe.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/MM/yy h:mm a",
     "shortDate": "d/MM/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-ph.js b/src/ngLocale/angular-locale_es-ph.js
index a51444bd235c..0d7bc9838a90 100644
--- a/src/ngLocale/angular-locale_es-ph.js
+++ b/src/ngLocale/angular-locale_es-ph.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y H:mm:ss",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y H:mm:ss",
+    "mediumDate": "d MMM y",
     "mediumTime": "H:mm:ss",
     "short": "d/M/yy H:mm",
     "shortDate": "d/M/yy",
diff --git a/src/ngLocale/angular-locale_es-pr.js b/src/ngLocale/angular-locale_es-pr.js
index 8b7d7b7cb0d6..0ac3ff9553c9 100644
--- a/src/ngLocale/angular-locale_es-pr.js
+++ b/src/ngLocale/angular-locale_es-pr.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,11 +57,15 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "MM/dd/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-py.js b/src/ngLocale/angular-locale_es-py.js
index 59cf9814dc47..3dd2301bb9f8 100644
--- a/src/ngLocale/angular-locale_es-py.js
+++ b/src/ngLocale/angular-locale_es-py.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
diff --git a/src/ngLocale/angular-locale_es-sv.js b/src/ngLocale/angular-locale_es-sv.js
index 9f3182a6a1a6..9a7574f259f4 100644
--- a/src/ngLocale/angular-locale_es-sv.js
+++ b/src/ngLocale/angular-locale_es-sv.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-us.js b/src/ngLocale/angular-locale_es-us.js
index 915c73731f8c..bb8e3ccce844 100644
--- a/src/ngLocale/angular-locale_es-us.js
+++ b/src/ngLocale/angular-locale_es-us.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-uy.js b/src/ngLocale/angular-locale_es-uy.js
index 856cd07fad9d..adfccd9f7c0a 100644
--- a/src/ngLocale/angular-locale_es-uy.js
+++ b/src/ngLocale/angular-locale_es-uy.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_es-ve.js b/src/ngLocale/angular-locale_es-ve.js
index 5af81067d8d4..ed2093cfc3a6 100644
--- a/src/ngLocale/angular-locale_es-ve.js
+++ b/src/ngLocale/angular-locale_es-ve.js
@@ -4,8 +4,8 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "a.\u00a0m.",
-      "p.\u00a0m."
+      "a. m.",
+      "p. m."
     ],
     "DAY": [
       "domingo",
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "enero",
       "febrero",
@@ -25,7 +34,7 @@ $provide.value("$locale", {
       "junio",
       "julio",
       "agosto",
-      "setiembre",
+      "septiembre",
       "octubre",
       "noviembre",
       "diciembre"
@@ -48,15 +57,19 @@ $provide.value("$locale", {
       "jun.",
       "jul.",
       "ago.",
-      "set.",
+      "sept.",
       "oct.",
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y h:mm:ss a",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y h:mm:ss a",
+    "mediumDate": "d MMM y",
     "mediumTime": "h:mm:ss a",
     "short": "d/M/yy h:mm a",
     "shortDate": "d/M/yy",
diff --git a/src/ngLocale/angular-locale_es.js b/src/ngLocale/angular-locale_es.js
index cce1c1311db4..929ab026725d 100644
--- a/src/ngLocale/angular-locale_es.js
+++ b/src/ngLocale/angular-locale_es.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "viernes",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despu\u00e9s de Cristo"
+    ],
+    "ERAS": [
+      "a. C.",
+      "d. C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "enero",
       "febrero",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "dic."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
-    "medium": "d 'de' MMM 'de' y H:mm:ss",
-    "mediumDate": "d 'de' MMM 'de' y",
+    "medium": "d MMM y H:mm:ss",
+    "mediumDate": "d MMM y",
     "mediumTime": "H:mm:ss",
     "short": "d/M/yy H:mm",
     "shortDate": "d/M/yy",
diff --git a/src/ngLocale/angular-locale_et-ee.js b/src/ngLocale/angular-locale_et-ee.js
index 5a4d6593edce..3b900ae31a3d 100644
--- a/src/ngLocale/angular-locale_et-ee.js
+++ b/src/ngLocale/angular-locale_et-ee.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "reede",
       "laup\u00e4ev"
     ],
+    "ERANAMES": [
+      "enne meie aega",
+      "meie aja j\u00e4rgi"
+    ],
+    "ERAS": [
+      "e.m.a.",
+      "m.a.j."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "jaanuar",
       "veebruar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dets"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y H:mm.ss",
diff --git a/src/ngLocale/angular-locale_et.js b/src/ngLocale/angular-locale_et.js
index bade0a014101..d10ad68a2f39 100644
--- a/src/ngLocale/angular-locale_et.js
+++ b/src/ngLocale/angular-locale_et.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "reede",
       "laup\u00e4ev"
     ],
+    "ERANAMES": [
+      "enne meie aega",
+      "meie aja j\u00e4rgi"
+    ],
+    "ERAS": [
+      "e.m.a.",
+      "m.a.j."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "jaanuar",
       "veebruar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dets"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y H:mm.ss",
diff --git a/src/ngLocale/angular-locale_eu-es.js b/src/ngLocale/angular-locale_eu-es.js
index 2734ba09692f..3a38161c4f86 100644
--- a/src/ngLocale/angular-locale_eu-es.js
+++ b/src/ngLocale/angular-locale_eu-es.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "ostirala",
       "larunbata"
     ],
+    "ERANAMES": [
+      "K.a.",
+      "K.o."
+    ],
+    "ERAS": [
+      "K.a.",
+      "K.o."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "urtarrilak",
       "otsailak",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "aza.",
       "abe."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y('e')'ko' MMMM d, EEEE",
     "longDate": "y('e')'ko' MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_eu.js b/src/ngLocale/angular-locale_eu.js
index 53714803422d..47e847112c48 100644
--- a/src/ngLocale/angular-locale_eu.js
+++ b/src/ngLocale/angular-locale_eu.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "ostirala",
       "larunbata"
     ],
+    "ERANAMES": [
+      "K.a.",
+      "K.o."
+    ],
+    "ERAS": [
+      "K.a.",
+      "K.o."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "urtarrilak",
       "otsailak",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "aza.",
       "abe."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y('e')'ko' MMMM d, EEEE",
     "longDate": "y('e')'ko' MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ewo-cm.js b/src/ngLocale/angular-locale_ewo-cm.js
index 28e20ed77aae..0acddea869f0 100644
--- a/src/ngLocale/angular-locale_ewo-cm.js
+++ b/src/ngLocale/angular-locale_ewo-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "f\u00falad\u00e9",
       "s\u00e9rad\u00e9"
     ],
+    "ERANAMES": [
+      "os\u00fas\u00faa Y\u00e9sus kiri",
+      "\u00e1mvus Y\u00e9sus Kir\u00eds"
+    ],
+    "ERAS": [
+      "oyk",
+      "ayk"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ng\u0254n os\u00fa",
       "ng\u0254n b\u025b\u030c",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ngad",
       "ngab"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ewo.js b/src/ngLocale/angular-locale_ewo.js
index 14b754cab917..dbef8cdecfdc 100644
--- a/src/ngLocale/angular-locale_ewo.js
+++ b/src/ngLocale/angular-locale_ewo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "f\u00falad\u00e9",
       "s\u00e9rad\u00e9"
     ],
+    "ERANAMES": [
+      "os\u00fas\u00faa Y\u00e9sus kiri",
+      "\u00e1mvus Y\u00e9sus Kir\u00eds"
+    ],
+    "ERAS": [
+      "oyk",
+      "ayk"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ng\u0254n os\u00fa",
       "ng\u0254n b\u025b\u030c",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ngad",
       "ngab"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fa-af.js b/src/ngLocale/angular-locale_fa-af.js
index e33ecd6c65bd..e3fccd3901a8 100644
--- a/src/ngLocale/angular-locale_fa-af.js
+++ b/src/ngLocale/angular-locale_fa-af.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u0647",
       "\u0634\u0646\u0628\u0647"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0632 \u0645\u06cc\u0644\u0627\u062f",
+      "\u0645\u06cc\u0644\u0627\u062f\u06cc"
+    ],
+    "ERAS": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u06cc",
       "\u0641\u0628\u0631\u0648\u0631\u06cc",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0627\u0645\u0628\u0631",
       "\u062f\u0633\u0645"
     ],
+    "WEEKENDRANGE": [
+      3,
+      4
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y H:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u200e\u00a4-",
+        "negPre": "-\u200e\u00a4",
         "negSuf": "",
         "posPre": "\u200e\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_fa-ir.js b/src/ngLocale/angular-locale_fa-ir.js
index 1e2c92698a59..44a72b74fe18 100644
--- a/src/ngLocale/angular-locale_fa-ir.js
+++ b/src/ngLocale/angular-locale_fa-ir.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u0647",
       "\u0634\u0646\u0628\u0647"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0632 \u0645\u06cc\u0644\u0627\u062f",
+      "\u0645\u06cc\u0644\u0627\u062f\u06cc"
+    ],
+    "ERAS": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u0698\u0627\u0646\u0648\u06cc\u0647\u0654",
       "\u0641\u0648\u0631\u06cc\u0647\u0654",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0627\u0645\u0628\u0631",
       "\u062f\u0633\u0627\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      4
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y H:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u200e\u00a4-",
+        "negPre": "-\u200e\u00a4",
         "negSuf": "",
         "posPre": "\u200e\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_fa.js b/src/ngLocale/angular-locale_fa.js
index d011ce3ab48e..48eb5dd038df 100644
--- a/src/ngLocale/angular-locale_fa.js
+++ b/src/ngLocale/angular-locale_fa.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u0647",
       "\u0634\u0646\u0628\u0647"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0632 \u0645\u06cc\u0644\u0627\u062f",
+      "\u0645\u06cc\u0644\u0627\u062f\u06cc"
+    ],
+    "ERAS": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u0698\u0627\u0646\u0648\u06cc\u0647\u0654",
       "\u0641\u0648\u0631\u06cc\u0647\u0654",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0627\u0645\u0628\u0631",
       "\u062f\u0633\u0627\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      4,
+      4
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y H:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u200e\u00a4-",
+        "negPre": "-\u200e\u00a4",
         "negSuf": "",
         "posPre": "\u200e\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ff-cm.js b/src/ngLocale/angular-locale_ff-cm.js
index 029357c1584c..87589cf17524 100644
--- a/src/ngLocale/angular-locale_ff-cm.js
+++ b/src/ngLocale/angular-locale_ff-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mawnde",
       "hoore-biir"
     ],
+    "ERANAMES": [
+      "Hade Iisa",
+      "Caggal Iisa"
+    ],
+    "ERAS": [
+      "H-I",
+      "C-I"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "siilo",
       "colte",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "jol",
       "bow"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ff-gn.js b/src/ngLocale/angular-locale_ff-gn.js
index 5b1c33585e9a..a7678f02d38d 100644
--- a/src/ngLocale/angular-locale_ff-gn.js
+++ b/src/ngLocale/angular-locale_ff-gn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mawnde",
       "hoore-biir"
     ],
+    "ERANAMES": [
+      "Hade Iisa",
+      "Caggal Iisa"
+    ],
+    "ERAS": [
+      "H-I",
+      "C-I"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "siilo",
       "colte",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "jol",
       "bow"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ff-mr.js b/src/ngLocale/angular-locale_ff-mr.js
index db8875e9e3c4..c36b8a2515eb 100644
--- a/src/ngLocale/angular-locale_ff-mr.js
+++ b/src/ngLocale/angular-locale_ff-mr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mawnde",
       "hoore-biir"
     ],
+    "ERANAMES": [
+      "Hade Iisa",
+      "Caggal Iisa"
+    ],
+    "ERAS": [
+      "H-I",
+      "C-I"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "siilo",
       "colte",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "jol",
       "bow"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ff-sn.js b/src/ngLocale/angular-locale_ff-sn.js
index bd7853cb5b42..e71e7b62214b 100644
--- a/src/ngLocale/angular-locale_ff-sn.js
+++ b/src/ngLocale/angular-locale_ff-sn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mawnde",
       "hoore-biir"
     ],
+    "ERANAMES": [
+      "Hade Iisa",
+      "Caggal Iisa"
+    ],
+    "ERAS": [
+      "H-I",
+      "C-I"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "siilo",
       "colte",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "jol",
       "bow"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ff.js b/src/ngLocale/angular-locale_ff.js
index a3a0460d28e7..9ce7b830c6f6 100644
--- a/src/ngLocale/angular-locale_ff.js
+++ b/src/ngLocale/angular-locale_ff.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mawnde",
       "hoore-biir"
     ],
+    "ERANAMES": [
+      "Hade Iisa",
+      "Caggal Iisa"
+    ],
+    "ERAS": [
+      "H-I",
+      "C-I"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "siilo",
       "colte",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "jol",
       "bow"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fi-fi.js b/src/ngLocale/angular-locale_fi-fi.js
index 548b266209dc..44bd41203986 100644
--- a/src/ngLocale/angular-locale_fi-fi.js
+++ b/src/ngLocale/angular-locale_fi-fi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "perjantaina",
       "lauantaina"
     ],
+    "ERANAMES": [
+      "ennen Kristuksen syntym\u00e4\u00e4",
+      "j\u00e4lkeen Kristuksen syntym\u00e4n"
+    ],
+    "ERAS": [
+      "eKr.",
+      "jKr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "tammikuuta",
       "helmikuuta",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "marraskuuta",
       "joulukuuta"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "cccc d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d.M.y H.mm.ss",
diff --git a/src/ngLocale/angular-locale_fi.js b/src/ngLocale/angular-locale_fi.js
index fa39b92fa3da..ade165642af4 100644
--- a/src/ngLocale/angular-locale_fi.js
+++ b/src/ngLocale/angular-locale_fi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "perjantaina",
       "lauantaina"
     ],
+    "ERANAMES": [
+      "ennen Kristuksen syntym\u00e4\u00e4",
+      "j\u00e4lkeen Kristuksen syntym\u00e4n"
+    ],
+    "ERAS": [
+      "eKr.",
+      "jKr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "tammikuuta",
       "helmikuuta",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "marraskuuta",
       "joulukuuta"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "cccc d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d.M.y H.mm.ss",
diff --git a/src/ngLocale/angular-locale_fil-ph.js b/src/ngLocale/angular-locale_fil-ph.js
index f2353366de11..541d3cde6d9a 100644
--- a/src/ngLocale/angular-locale_fil-ph.js
+++ b/src/ngLocale/angular-locale_fil-ph.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Biyernes",
       "Sabado"
     ],
+    "ERANAMES": [
+      "BC",
+      "AD"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Enero",
       "Pebrero",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nob",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_fil.js b/src/ngLocale/angular-locale_fil.js
index 16746f74c591..5cded550bdd0 100644
--- a/src/ngLocale/angular-locale_fil.js
+++ b/src/ngLocale/angular-locale_fil.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Biyernes",
       "Sabado"
     ],
+    "ERANAMES": [
+      "BC",
+      "AD"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Enero",
       "Pebrero",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nob",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_fo-fo.js b/src/ngLocale/angular-locale_fo-fo.js
index f1ffb9bc37bb..a861d8c3bda9 100644
--- a/src/ngLocale/angular-locale_fo-fo.js
+++ b/src/ngLocale/angular-locale_fo-fo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fr\u00edggjadagur",
       "leygardagur"
     ],
+    "ERANAMES": [
+      "fyrir Krist",
+      "eftir Krist"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "d. MMM y",
     "medium": "dd-MM-y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fo.js b/src/ngLocale/angular-locale_fo.js
index a4abbd243a47..aa33cd323107 100644
--- a/src/ngLocale/angular-locale_fo.js
+++ b/src/ngLocale/angular-locale_fo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fr\u00edggjadagur",
       "leygardagur"
     ],
+    "ERANAMES": [
+      "fyrir Krist",
+      "eftir Krist"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "d. MMM y",
     "medium": "dd-MM-y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-be.js b/src/ngLocale/angular-locale_fr-be.js
index 623df80402ba..acec9a42545c 100644
--- a/src/ngLocale/angular-locale_fr-be.js
+++ b/src/ngLocale/angular-locale_fr-be.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-bf.js b/src/ngLocale/angular-locale_fr-bf.js
index 23f81c3ff4b4..bd30d5500301 100644
--- a/src/ngLocale/angular-locale_fr-bf.js
+++ b/src/ngLocale/angular-locale_fr-bf.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-bi.js b/src/ngLocale/angular-locale_fr-bi.js
index cf8af16aa412..39d3b329b628 100644
--- a/src/ngLocale/angular-locale_fr-bi.js
+++ b/src/ngLocale/angular-locale_fr-bi.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-bj.js b/src/ngLocale/angular-locale_fr-bj.js
index 04c8293136a9..6753f0203fde 100644
--- a/src/ngLocale/angular-locale_fr-bj.js
+++ b/src/ngLocale/angular-locale_fr-bj.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-bl.js b/src/ngLocale/angular-locale_fr-bl.js
index 910538602ce3..2f15f5a32409 100644
--- a/src/ngLocale/angular-locale_fr-bl.js
+++ b/src/ngLocale/angular-locale_fr-bl.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-ca.js b/src/ngLocale/angular-locale_fr-ca.js
index 6ce1be7124c7..6f5f703bce80 100644
--- a/src/ngLocale/angular-locale_fr-ca.js
+++ b/src/ngLocale/angular-locale_fr-ca.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,10 +62,14 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "y-MM-dd HH:mm:ss",
-    "mediumDate": "y-MM-dd",
+    "medium": "d MMM y HH:mm:ss",
+    "mediumDate": "d MMM y",
     "mediumTime": "HH:mm:ss",
     "short": "yy-MM-dd HH:mm",
     "shortDate": "yy-MM-dd",
diff --git a/src/ngLocale/angular-locale_fr-cd.js b/src/ngLocale/angular-locale_fr-cd.js
index 666a7af266bb..1e1d1cc3dc89 100644
--- a/src/ngLocale/angular-locale_fr-cd.js
+++ b/src/ngLocale/angular-locale_fr-cd.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-cf.js b/src/ngLocale/angular-locale_fr-cf.js
index 5dafc262b8b4..bf60553820ae 100644
--- a/src/ngLocale/angular-locale_fr-cf.js
+++ b/src/ngLocale/angular-locale_fr-cf.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-cg.js b/src/ngLocale/angular-locale_fr-cg.js
index 9a7a36648204..c4417732b979 100644
--- a/src/ngLocale/angular-locale_fr-cg.js
+++ b/src/ngLocale/angular-locale_fr-cg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-ch.js b/src/ngLocale/angular-locale_fr-ch.js
index bb51a7da9965..e69d2fe3c8fc 100644
--- a/src/ngLocale/angular-locale_fr-ch.js
+++ b/src/ngLocale/angular-locale_fr-ch.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-ci.js b/src/ngLocale/angular-locale_fr-ci.js
index a60a08d314ac..2954b10386ee 100644
--- a/src/ngLocale/angular-locale_fr-ci.js
+++ b/src/ngLocale/angular-locale_fr-ci.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-cm.js b/src/ngLocale/angular-locale_fr-cm.js
index a00572bc27a3..d8f03d2e0042 100644
--- a/src/ngLocale/angular-locale_fr-cm.js
+++ b/src/ngLocale/angular-locale_fr-cm.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-dj.js b/src/ngLocale/angular-locale_fr-dj.js
index da5ad32ae0f6..9c850c2989eb 100644
--- a/src/ngLocale/angular-locale_fr-dj.js
+++ b/src/ngLocale/angular-locale_fr-dj.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-dz.js b/src/ngLocale/angular-locale_fr-dz.js
index a2da5c93deb2..ae1e1c67525e 100644
--- a/src/ngLocale/angular-locale_fr-dz.js
+++ b/src/ngLocale/angular-locale_fr-dz.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-fr.js b/src/ngLocale/angular-locale_fr-fr.js
index adac17d9b7d7..bdef4eff377e 100644
--- a/src/ngLocale/angular-locale_fr-fr.js
+++ b/src/ngLocale/angular-locale_fr-fr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-ga.js b/src/ngLocale/angular-locale_fr-ga.js
index 375cd3d5ca60..6268c7775ef2 100644
--- a/src/ngLocale/angular-locale_fr-ga.js
+++ b/src/ngLocale/angular-locale_fr-ga.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-gf.js b/src/ngLocale/angular-locale_fr-gf.js
index 64c1fb46a731..a7d37a0ff71c 100644
--- a/src/ngLocale/angular-locale_fr-gf.js
+++ b/src/ngLocale/angular-locale_fr-gf.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-gn.js b/src/ngLocale/angular-locale_fr-gn.js
index ec302c37b4d3..34f4b1010be9 100644
--- a/src/ngLocale/angular-locale_fr-gn.js
+++ b/src/ngLocale/angular-locale_fr-gn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-gp.js b/src/ngLocale/angular-locale_fr-gp.js
index b74d67d18d73..9db67089d86c 100644
--- a/src/ngLocale/angular-locale_fr-gp.js
+++ b/src/ngLocale/angular-locale_fr-gp.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-gq.js b/src/ngLocale/angular-locale_fr-gq.js
index 8d959aa9179c..02bbba29455c 100644
--- a/src/ngLocale/angular-locale_fr-gq.js
+++ b/src/ngLocale/angular-locale_fr-gq.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-ht.js b/src/ngLocale/angular-locale_fr-ht.js
index 5c40052ced50..116e0da63770 100644
--- a/src/ngLocale/angular-locale_fr-ht.js
+++ b/src/ngLocale/angular-locale_fr-ht.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-km.js b/src/ngLocale/angular-locale_fr-km.js
index c4270dd0dd99..e178c7f3d9c0 100644
--- a/src/ngLocale/angular-locale_fr-km.js
+++ b/src/ngLocale/angular-locale_fr-km.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-lu.js b/src/ngLocale/angular-locale_fr-lu.js
index 2bec375910f1..bb2362772dc3 100644
--- a/src/ngLocale/angular-locale_fr-lu.js
+++ b/src/ngLocale/angular-locale_fr-lu.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-ma.js b/src/ngLocale/angular-locale_fr-ma.js
index 1c6742eb502e..92edf74b5f28 100644
--- a/src/ngLocale/angular-locale_fr-ma.js
+++ b/src/ngLocale/angular-locale_fr-ma.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-mc.js b/src/ngLocale/angular-locale_fr-mc.js
index ab90ea1c4e4d..85e0233e9bba 100644
--- a/src/ngLocale/angular-locale_fr-mc.js
+++ b/src/ngLocale/angular-locale_fr-mc.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-mf.js b/src/ngLocale/angular-locale_fr-mf.js
index 2acc80604c2d..2abced5c24d4 100644
--- a/src/ngLocale/angular-locale_fr-mf.js
+++ b/src/ngLocale/angular-locale_fr-mf.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-mg.js b/src/ngLocale/angular-locale_fr-mg.js
index 403a377f0cc6..02d274787243 100644
--- a/src/ngLocale/angular-locale_fr-mg.js
+++ b/src/ngLocale/angular-locale_fr-mg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-ml.js b/src/ngLocale/angular-locale_fr-ml.js
index 79ea5ba39d02..e4549e2b0d8c 100644
--- a/src/ngLocale/angular-locale_fr-ml.js
+++ b/src/ngLocale/angular-locale_fr-ml.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-mq.js b/src/ngLocale/angular-locale_fr-mq.js
index 094bd48a41f4..3973b32e3a5c 100644
--- a/src/ngLocale/angular-locale_fr-mq.js
+++ b/src/ngLocale/angular-locale_fr-mq.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-mr.js b/src/ngLocale/angular-locale_fr-mr.js
index f00f2ab186f2..5b993c6dcfcf 100644
--- a/src/ngLocale/angular-locale_fr-mr.js
+++ b/src/ngLocale/angular-locale_fr-mr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-mu.js b/src/ngLocale/angular-locale_fr-mu.js
index 129173bfa321..7b09bd2ead01 100644
--- a/src/ngLocale/angular-locale_fr-mu.js
+++ b/src/ngLocale/angular-locale_fr-mu.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-nc.js b/src/ngLocale/angular-locale_fr-nc.js
index fe1d03e9c728..a0694a9fd723 100644
--- a/src/ngLocale/angular-locale_fr-nc.js
+++ b/src/ngLocale/angular-locale_fr-nc.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-ne.js b/src/ngLocale/angular-locale_fr-ne.js
index 8e97467d5649..7fd048212323 100644
--- a/src/ngLocale/angular-locale_fr-ne.js
+++ b/src/ngLocale/angular-locale_fr-ne.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-pf.js b/src/ngLocale/angular-locale_fr-pf.js
index 2d4bbeed2eaa..d5d023a330f0 100644
--- a/src/ngLocale/angular-locale_fr-pf.js
+++ b/src/ngLocale/angular-locale_fr-pf.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-pm.js b/src/ngLocale/angular-locale_fr-pm.js
index f2dcdf06c49c..2ed15ec99554 100644
--- a/src/ngLocale/angular-locale_fr-pm.js
+++ b/src/ngLocale/angular-locale_fr-pm.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-re.js b/src/ngLocale/angular-locale_fr-re.js
index 565405cb2489..1c1e849ea7d9 100644
--- a/src/ngLocale/angular-locale_fr-re.js
+++ b/src/ngLocale/angular-locale_fr-re.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-rw.js b/src/ngLocale/angular-locale_fr-rw.js
index c29f5126a898..8966b7a8ce83 100644
--- a/src/ngLocale/angular-locale_fr-rw.js
+++ b/src/ngLocale/angular-locale_fr-rw.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-sc.js b/src/ngLocale/angular-locale_fr-sc.js
index 55a44ba982c2..80410913af43 100644
--- a/src/ngLocale/angular-locale_fr-sc.js
+++ b/src/ngLocale/angular-locale_fr-sc.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-sn.js b/src/ngLocale/angular-locale_fr-sn.js
index aa754dbb5b6c..100a1025a466 100644
--- a/src/ngLocale/angular-locale_fr-sn.js
+++ b/src/ngLocale/angular-locale_fr-sn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-sy.js b/src/ngLocale/angular-locale_fr-sy.js
index 10d8f3e7e3f3..8bcfaf1a1751 100644
--- a/src/ngLocale/angular-locale_fr-sy.js
+++ b/src/ngLocale/angular-locale_fr-sy.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-td.js b/src/ngLocale/angular-locale_fr-td.js
index 0f059565fa22..2341ef760a1f 100644
--- a/src/ngLocale/angular-locale_fr-td.js
+++ b/src/ngLocale/angular-locale_fr-td.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-tg.js b/src/ngLocale/angular-locale_fr-tg.js
index 862a53b9940f..a7c21313171d 100644
--- a/src/ngLocale/angular-locale_fr-tg.js
+++ b/src/ngLocale/angular-locale_fr-tg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-tn.js b/src/ngLocale/angular-locale_fr-tn.js
index 5ffeac920284..14a31151a3cf 100644
--- a/src/ngLocale/angular-locale_fr-tn.js
+++ b/src/ngLocale/angular-locale_fr-tn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-vu.js b/src/ngLocale/angular-locale_fr-vu.js
index 76ab118eab34..d23d528c6c27 100644
--- a/src/ngLocale/angular-locale_fr-vu.js
+++ b/src/ngLocale/angular-locale_fr-vu.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-wf.js b/src/ngLocale/angular-locale_fr-wf.js
index 840ad714bdc0..bf5a357bbb9d 100644
--- a/src/ngLocale/angular-locale_fr-wf.js
+++ b/src/ngLocale/angular-locale_fr-wf.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr-yt.js b/src/ngLocale/angular-locale_fr-yt.js
index b0cc0285aef3..265a0324f30d 100644
--- a/src/ngLocale/angular-locale_fr-yt.js
+++ b/src/ngLocale/angular-locale_fr-yt.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fr.js b/src/ngLocale/angular-locale_fr.js
index 00e11316ffd4..f4d89ba2a502 100644
--- a/src/ngLocale/angular-locale_fr.js
+++ b/src/ngLocale/angular-locale_fr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "vendredi",
       "samedi"
     ],
+    "ERANAMES": [
+      "avant J\u00e9sus-Christ",
+      "apr\u00e8s J\u00e9sus-Christ"
+    ],
+    "ERAS": [
+      "av. J.-C.",
+      "ap. J.-C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janvier",
       "f\u00e9vrier",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "d\u00e9c."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fur-it.js b/src/ngLocale/angular-locale_fur-it.js
index c6320fc8a098..8f1e80b91355 100644
--- a/src/ngLocale/angular-locale_fur-it.js
+++ b/src/ngLocale/angular-locale_fur-it.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vinars",
       "sabide"
     ],
+    "ERANAMES": [
+      "pdC",
+      "ddC"
+    ],
+    "ERAS": [
+      "pdC",
+      "ddC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Zen\u00e2r",
       "Fevr\u00e2r",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dic"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d 'di' MMMM 'dal' y",
     "longDate": "d 'di' MMMM 'dal' y",
     "medium": "dd/MM/y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_fur.js b/src/ngLocale/angular-locale_fur.js
index 53bf1fd79e5d..ccb733004f8e 100644
--- a/src/ngLocale/angular-locale_fur.js
+++ b/src/ngLocale/angular-locale_fur.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vinars",
       "sabide"
     ],
+    "ERANAMES": [
+      "pdC",
+      "ddC"
+    ],
+    "ERAS": [
+      "pdC",
+      "ddC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Zen\u00e2r",
       "Fevr\u00e2r",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dic"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d 'di' MMMM 'dal' y",
     "longDate": "d 'di' MMMM 'dal' y",
     "medium": "dd/MM/y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_fy-nl.js b/src/ngLocale/angular-locale_fy-nl.js
index 1c76015ede4e..234e983b78f2 100644
--- a/src/ngLocale/angular-locale_fy-nl.js
+++ b/src/ngLocale/angular-locale_fy-nl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "freed",
       "sneon"
     ],
+    "ERANAMES": [
+      "Foar Kristus",
+      "nei Kristus"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "n.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "jannewaris",
       "febrewaris",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_fy.js b/src/ngLocale/angular-locale_fy.js
index f25abbf906ba..6bf7ba6b0a7b 100644
--- a/src/ngLocale/angular-locale_fy.js
+++ b/src/ngLocale/angular-locale_fy.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "freed",
       "sneon"
     ],
+    "ERANAMES": [
+      "Foar Kristus",
+      "nei Kristus"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "n.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "jannewaris",
       "febrewaris",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ga-ie.js b/src/ngLocale/angular-locale_ga-ie.js
index 487b959c9017..5740a197d82d 100644
--- a/src/ngLocale/angular-locale_ga-ie.js
+++ b/src/ngLocale/angular-locale_ga-ie.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "D\u00e9 hAoine",
       "D\u00e9 Sathairn"
     ],
+    "ERANAMES": [
+      "Roimh Chr\u00edost",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "RC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ean\u00e1ir",
       "Feabhra",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Samh",
       "Noll"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ga.js b/src/ngLocale/angular-locale_ga.js
index b6291743f121..76f0d145e67b 100644
--- a/src/ngLocale/angular-locale_ga.js
+++ b/src/ngLocale/angular-locale_ga.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "D\u00e9 hAoine",
       "D\u00e9 Sathairn"
     ],
+    "ERANAMES": [
+      "Roimh Chr\u00edost",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "RC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ean\u00e1ir",
       "Feabhra",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Samh",
       "Noll"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_gd-gb.js b/src/ngLocale/angular-locale_gd-gb.js
index c9b2db6fdf10..c245bc5d78da 100644
--- a/src/ngLocale/angular-locale_gd-gb.js
+++ b/src/ngLocale/angular-locale_gd-gb.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "DihAoine",
       "DiSathairne"
     ],
+    "ERANAMES": [
+      "Ro Chr\u00ecosta",
+      "An d\u00e8idh Chr\u00ecosta"
+    ],
+    "ERAS": [
+      "RC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "dhen Fhaoilleach",
       "dhen Ghearran",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Samh",
       "D\u00f9bh"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d'mh' MMMM y",
     "longDate": "d'mh' MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_gd.js b/src/ngLocale/angular-locale_gd.js
index f45d324da6d2..9fe0c4d80f06 100644
--- a/src/ngLocale/angular-locale_gd.js
+++ b/src/ngLocale/angular-locale_gd.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "DihAoine",
       "DiSathairne"
     ],
+    "ERANAMES": [
+      "Ro Chr\u00ecosta",
+      "An d\u00e8idh Chr\u00ecosta"
+    ],
+    "ERAS": [
+      "RC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "dhen Fhaoilleach",
       "dhen Ghearran",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Samh",
       "D\u00f9bh"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d'mh' MMMM y",
     "longDate": "d'mh' MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_gl-es.js b/src/ngLocale/angular-locale_gl-es.js
index e40a8254c162..fff9928c8f18 100644
--- a/src/ngLocale/angular-locale_gl-es.js
+++ b/src/ngLocale/angular-locale_gl-es.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venres",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "xaneiro",
       "febreiro",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_gl.js b/src/ngLocale/angular-locale_gl.js
index d17ec63dc910..9223c2769f10 100644
--- a/src/ngLocale/angular-locale_gl.js
+++ b/src/ngLocale/angular-locale_gl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venres",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "despois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "xaneiro",
       "febreiro",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_gsw-ch.js b/src/ngLocale/angular-locale_gsw-ch.js
index dfc57889fb05..54278de0ac70 100644
--- a/src/ngLocale/angular-locale_gsw-ch.js
+++ b/src/ngLocale/angular-locale_gsw-ch.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Friitig",
       "Samschtig"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_gsw-fr.js b/src/ngLocale/angular-locale_gsw-fr.js
index 7bf4b584cae8..979ced7a77e4 100644
--- a/src/ngLocale/angular-locale_gsw-fr.js
+++ b/src/ngLocale/angular-locale_gsw-fr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Friitig",
       "Samschtig"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_gsw-li.js b/src/ngLocale/angular-locale_gsw-li.js
index 8482f222593b..c1a5aebcfb76 100644
--- a/src/ngLocale/angular-locale_gsw-li.js
+++ b/src/ngLocale/angular-locale_gsw-li.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Friitig",
       "Samschtig"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_gsw.js b/src/ngLocale/angular-locale_gsw.js
index b05cc6a43e7a..93ef2cd09ac0 100644
--- a/src/ngLocale/angular-locale_gsw.js
+++ b/src/ngLocale/angular-locale_gsw.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Friitig",
       "Samschtig"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "dd.MM.y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_gu-in.js b/src/ngLocale/angular-locale_gu-in.js
index e9059a97f170..db7daba84954 100644
--- a/src/ngLocale/angular-locale_gu-in.js
+++ b/src/ngLocale/angular-locale_gu-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0ab6\u0ac1\u0a95\u0acd\u0ab0\u0ab5\u0abe\u0ab0",
       "\u0ab6\u0aa8\u0abf\u0ab5\u0abe\u0ab0"
     ],
+    "ERANAMES": [
+      "\u0a88\u0ab8\u0ab5\u0ac0\u0ab8\u0aa8 \u0aaa\u0ac2\u0ab0\u0acd\u0ab5\u0ac7",
+      "\u0a87\u0ab8\u0ab5\u0ac0\u0ab8\u0aa8"
+    ],
+    "ERAS": [
+      "\u0a88\u0ab8\u0ac1\u0aa8\u0abe \u0a9c\u0aa8\u0acd\u0aae \u0aaa\u0ab9\u0ac7\u0ab2\u0abe",
+      "\u0a87\u0ab8\u0ab5\u0ac0\u0ab8\u0aa8"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0a9c\u0abe\u0aa8\u0acd\u0aaf\u0ac1\u0a86\u0ab0\u0ac0",
       "\u0aab\u0ac7\u0aac\u0acd\u0ab0\u0ac1\u0a86\u0ab0\u0ac0",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0aa8\u0ab5\u0ac7",
       "\u0aa1\u0abf\u0ab8\u0ac7"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y hh:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_gu.js b/src/ngLocale/angular-locale_gu.js
index 2f8e7e1a3e16..a66e2b549fa9 100644
--- a/src/ngLocale/angular-locale_gu.js
+++ b/src/ngLocale/angular-locale_gu.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0ab6\u0ac1\u0a95\u0acd\u0ab0\u0ab5\u0abe\u0ab0",
       "\u0ab6\u0aa8\u0abf\u0ab5\u0abe\u0ab0"
     ],
+    "ERANAMES": [
+      "\u0a88\u0ab8\u0ab5\u0ac0\u0ab8\u0aa8 \u0aaa\u0ac2\u0ab0\u0acd\u0ab5\u0ac7",
+      "\u0a87\u0ab8\u0ab5\u0ac0\u0ab8\u0aa8"
+    ],
+    "ERAS": [
+      "\u0a88\u0ab8\u0ac1\u0aa8\u0abe \u0a9c\u0aa8\u0acd\u0aae \u0aaa\u0ab9\u0ac7\u0ab2\u0abe",
+      "\u0a87\u0ab8\u0ab5\u0ac0\u0ab8\u0aa8"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0a9c\u0abe\u0aa8\u0acd\u0aaf\u0ac1\u0a86\u0ab0\u0ac0",
       "\u0aab\u0ac7\u0aac\u0acd\u0ab0\u0ac1\u0a86\u0ab0\u0ac0",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0aa8\u0ab5\u0ac7",
       "\u0aa1\u0abf\u0ab8\u0ac7"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y hh:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_guz-ke.js b/src/ngLocale/angular-locale_guz-ke.js
index 0bbe69d52555..675efe9537bf 100644
--- a/src/ngLocale/angular-locale_guz-ke.js
+++ b/src/ngLocale/angular-locale_guz-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ichuma",
       "Esabato"
     ],
+    "ERANAMES": [
+      "Yeso ataiborwa",
+      "Yeso kaiboirwe"
+    ],
+    "ERAS": [
+      "YA",
+      "YK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Chanuari",
       "Feburari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nob",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_guz.js b/src/ngLocale/angular-locale_guz.js
index 2fa76b328ecd..9ce1ce3f1a75 100644
--- a/src/ngLocale/angular-locale_guz.js
+++ b/src/ngLocale/angular-locale_guz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ichuma",
       "Esabato"
     ],
+    "ERANAMES": [
+      "Yeso ataiborwa",
+      "Yeso kaiboirwe"
+    ],
+    "ERAS": [
+      "YA",
+      "YK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Chanuari",
       "Feburari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nob",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_gv-im.js b/src/ngLocale/angular-locale_gv-im.js
index 196a8e1ff87b..aca51df15c8b 100644
--- a/src/ngLocale/angular-locale_gv-im.js
+++ b/src/ngLocale/angular-locale_gv-im.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jeheiney",
       "Jesarn"
     ],
+    "ERANAMES": [
+      "RC",
+      "AD"
+    ],
+    "ERAS": [
+      "RC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Jerrey-geuree",
       "Toshiaght-arree",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "M.Houney",
       "M.Nollick"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "MMM dd, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_gv.js b/src/ngLocale/angular-locale_gv.js
index b827f2b654c0..0f99b6a475e3 100644
--- a/src/ngLocale/angular-locale_gv.js
+++ b/src/ngLocale/angular-locale_gv.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jeheiney",
       "Jesarn"
     ],
+    "ERANAMES": [
+      "RC",
+      "AD"
+    ],
+    "ERAS": [
+      "RC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Jerrey-geuree",
       "Toshiaght-arree",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "M.Houney",
       "M.Nollick"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "MMM dd, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ha-latn-gh.js b/src/ngLocale/angular-locale_ha-latn-gh.js
index b7ee3177fbf4..c5209311eb44 100644
--- a/src/ngLocale/angular-locale_ha-latn-gh.js
+++ b/src/ngLocale/angular-locale_ha-latn-gh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jumma\u02bca",
       "Asabar"
     ],
+    "ERANAMES": [
+      "Kafin haihuwar annab",
+      "Bayan haihuwar annab"
+    ],
+    "ERAS": [
+      "KHAI",
+      "BHAI"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janairu",
       "Faburairu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nuw",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ha-latn-ne.js b/src/ngLocale/angular-locale_ha-latn-ne.js
index 53ee55d7619e..f4b280c5b738 100644
--- a/src/ngLocale/angular-locale_ha-latn-ne.js
+++ b/src/ngLocale/angular-locale_ha-latn-ne.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jumma\u02bca",
       "Asabar"
     ],
+    "ERANAMES": [
+      "Kafin haihuwar annab",
+      "Bayan haihuwar annab"
+    ],
+    "ERAS": [
+      "KHAI",
+      "BHAI"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janairu",
       "Faburairu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nuw",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ha-latn-ng.js b/src/ngLocale/angular-locale_ha-latn-ng.js
index 141a32a65ec6..81af53ebf344 100644
--- a/src/ngLocale/angular-locale_ha-latn-ng.js
+++ b/src/ngLocale/angular-locale_ha-latn-ng.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jumma\u02bca",
       "Asabar"
     ],
+    "ERANAMES": [
+      "Kafin haihuwar annab",
+      "Bayan haihuwar annab"
+    ],
+    "ERAS": [
+      "KHAI",
+      "BHAI"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janairu",
       "Faburairu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nuw",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ha-latn.js b/src/ngLocale/angular-locale_ha-latn.js
index 5f392435962b..615939cd89f1 100644
--- a/src/ngLocale/angular-locale_ha-latn.js
+++ b/src/ngLocale/angular-locale_ha-latn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jumma\u02bca",
       "Asabar"
     ],
+    "ERANAMES": [
+      "Kafin haihuwar annab",
+      "Bayan haihuwar annab"
+    ],
+    "ERAS": [
+      "KHAI",
+      "BHAI"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janairu",
       "Faburairu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nuw",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "\u20a6",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ha.js b/src/ngLocale/angular-locale_ha.js
index 30146d32c74c..0f36507e6a0f 100644
--- a/src/ngLocale/angular-locale_ha.js
+++ b/src/ngLocale/angular-locale_ha.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jumma\u02bca",
       "Asabar"
     ],
+    "ERANAMES": [
+      "Kafin haihuwar annab",
+      "Bayan haihuwar annab"
+    ],
+    "ERAS": [
+      "KHAI",
+      "BHAI"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janairu",
       "Faburairu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nuw",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_haw-us.js b/src/ngLocale/angular-locale_haw-us.js
index 0699f565c897..4091590e7aa9 100644
--- a/src/ngLocale/angular-locale_haw-us.js
+++ b/src/ngLocale/angular-locale_haw-us.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Po\u02bbalima",
       "Po\u02bbaono"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ianuali",
       "Pepeluali",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Now.",
       "Kek."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_haw.js b/src/ngLocale/angular-locale_haw.js
index 866c92958589..a1253a4a9d59 100644
--- a/src/ngLocale/angular-locale_haw.js
+++ b/src/ngLocale/angular-locale_haw.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Po\u02bbalima",
       "Po\u02bbaono"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ianuali",
       "Pepeluali",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Now.",
       "Kek."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_he-il.js b/src/ngLocale/angular-locale_he-il.js
index 804e25bd01ee..7a05b986a7a1 100644
--- a/src/ngLocale/angular-locale_he-il.js
+++ b/src/ngLocale/angular-locale_he-il.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u05d9\u05d5\u05dd \u05e9\u05d9\u05e9\u05d9",
       "\u05d9\u05d5\u05dd \u05e9\u05d1\u05ea"
     ],
+    "ERANAMES": [
+      "\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e1\u05e4\u05d9\u05e8\u05d4",
+      "\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4"
+    ],
+    "ERAS": [
+      "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e1",
+      "\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u05d9\u05e0\u05d5\u05d0\u05e8",
       "\u05e4\u05d1\u05e8\u05d5\u05d0\u05e8",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "\u05e0\u05d5\u05d1\u05f3",
       "\u05d3\u05e6\u05de\u05f3"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE, d \u05d1MMMM y",
     "longDate": "d \u05d1MMMM y",
-    "medium": "d \u05d1MMM y HH:mm:ss",
+    "medium": "d \u05d1MMM y H:mm:ss",
     "mediumDate": "d \u05d1MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "d.M.y HH:mm",
+    "mediumTime": "H:mm:ss",
+    "short": "d.M.y H:mm",
     "shortDate": "d.M.y",
-    "shortTime": "HH:mm"
+    "shortTime": "H:mm"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u20aa",
diff --git a/src/ngLocale/angular-locale_he.js b/src/ngLocale/angular-locale_he.js
index 6b525ca7284d..2ef1d3c2c253 100644
--- a/src/ngLocale/angular-locale_he.js
+++ b/src/ngLocale/angular-locale_he.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u05d9\u05d5\u05dd \u05e9\u05d9\u05e9\u05d9",
       "\u05d9\u05d5\u05dd \u05e9\u05d1\u05ea"
     ],
+    "ERANAMES": [
+      "\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e1\u05e4\u05d9\u05e8\u05d4",
+      "\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4"
+    ],
+    "ERAS": [
+      "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e1",
+      "\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u05d9\u05e0\u05d5\u05d0\u05e8",
       "\u05e4\u05d1\u05e8\u05d5\u05d0\u05e8",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "\u05e0\u05d5\u05d1\u05f3",
       "\u05d3\u05e6\u05de\u05f3"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE, d \u05d1MMMM y",
     "longDate": "d \u05d1MMMM y",
-    "medium": "d \u05d1MMM y HH:mm:ss",
+    "medium": "d \u05d1MMM y H:mm:ss",
     "mediumDate": "d \u05d1MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "d.M.y HH:mm",
+    "mediumTime": "H:mm:ss",
+    "short": "d.M.y H:mm",
     "shortDate": "d.M.y",
-    "shortTime": "HH:mm"
+    "shortTime": "H:mm"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u20aa",
diff --git a/src/ngLocale/angular-locale_hi-in.js b/src/ngLocale/angular-locale_hi-in.js
index e1b0b8b27398..febae3995bbc 100644
--- a/src/ngLocale/angular-locale_hi-in.js
+++ b/src/ngLocale/angular-locale_hi-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930",
       "\u0936\u0928\u093f\u0935\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u093e-\u092a\u0942\u0930\u094d\u0935",
+      "\u0908\u0938\u0935\u0940 \u0938\u0928"
+    ],
+    "ERAS": [
+      "\u0908\u0938\u093e-\u092a\u0942\u0930\u094d\u0935",
+      "\u0908\u0938\u094d\u0935\u0940"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u0928\u0935\u0930\u0940",
       "\u092b\u093c\u0930\u0935\u0930\u0940",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0928\u0935\u0970",
       "\u0926\u093f\u0938\u0970"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd/MM/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_hi.js b/src/ngLocale/angular-locale_hi.js
index d800a286adfd..e5c34123669f 100644
--- a/src/ngLocale/angular-locale_hi.js
+++ b/src/ngLocale/angular-locale_hi.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930",
       "\u0936\u0928\u093f\u0935\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u093e-\u092a\u0942\u0930\u094d\u0935",
+      "\u0908\u0938\u0935\u0940 \u0938\u0928"
+    ],
+    "ERAS": [
+      "\u0908\u0938\u093e-\u092a\u0942\u0930\u094d\u0935",
+      "\u0908\u0938\u094d\u0935\u0940"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u0928\u0935\u0930\u0940",
       "\u092b\u093c\u0930\u0935\u0930\u0940",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0928\u0935\u0970",
       "\u0926\u093f\u0938\u0970"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd/MM/y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_hr-ba.js b/src/ngLocale/angular-locale_hr-ba.js
index 03a7a43b9ad7..cb70c76e7415 100644
--- a/src/ngLocale/angular-locale_hr-ba.js
+++ b/src/ngLocale/angular-locale_hr-ba.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Prije Krista",
+      "Poslije Krista"
+    ],
+    "ERAS": [
+      "pr. Kr.",
+      "p. Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "sije\u010dnja",
       "velja\u010de",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "stu",
       "pro"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y.",
     "longDate": "d. MMMM y.",
     "medium": "d. MMM y. HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_hr-hr.js b/src/ngLocale/angular-locale_hr-hr.js
index 492d82d739c6..248734f6b069 100644
--- a/src/ngLocale/angular-locale_hr-hr.js
+++ b/src/ngLocale/angular-locale_hr-hr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Prije Krista",
+      "Poslije Krista"
+    ],
+    "ERAS": [
+      "pr. Kr.",
+      "p. Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "sije\u010dnja",
       "velja\u010de",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "stu",
       "pro"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y.",
     "longDate": "d. MMMM y.",
     "medium": "d. MMM y. HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_hr.js b/src/ngLocale/angular-locale_hr.js
index baf7530074af..4f6f1c140cf1 100644
--- a/src/ngLocale/angular-locale_hr.js
+++ b/src/ngLocale/angular-locale_hr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Prije Krista",
+      "Poslije Krista"
+    ],
+    "ERAS": [
+      "pr. Kr.",
+      "p. Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "sije\u010dnja",
       "velja\u010de",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "stu",
       "pro"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y.",
     "longDate": "d. MMMM y.",
     "medium": "d. MMM y. HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_hsb-de.js b/src/ngLocale/angular-locale_hsb-de.js
index 4c27db877306..f432ed9491c4 100644
--- a/src/ngLocale/angular-locale_hsb-de.js
+++ b/src/ngLocale/angular-locale_hsb-de.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "pjatk",
       "sobota"
     ],
+    "ERANAMES": [
+      "p\u0159ed Chrystowym narod\u017aenjom",
+      "po Chrystowym narod\u017aenju"
+    ],
+    "ERAS": [
+      "p\u0159.Chr.n.",
+      "po Chr.n."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januara",
       "februara",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "now.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d.M.y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_hsb.js b/src/ngLocale/angular-locale_hsb.js
index fbe9e8f7f0af..c11ebc7832e9 100644
--- a/src/ngLocale/angular-locale_hsb.js
+++ b/src/ngLocale/angular-locale_hsb.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "pjatk",
       "sobota"
     ],
+    "ERANAMES": [
+      "p\u0159ed Chrystowym narod\u017aenjom",
+      "po Chrystowym narod\u017aenju"
+    ],
+    "ERAS": [
+      "p\u0159.Chr.n.",
+      "po Chr.n."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januara",
       "februara",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "now.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d.M.y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_hu-hu.js b/src/ngLocale/angular-locale_hu-hu.js
index 47130b8817b8..10a3bbc518fe 100644
--- a/src/ngLocale/angular-locale_hu-hu.js
+++ b/src/ngLocale/angular-locale_hu-hu.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "p\u00e9ntek",
       "szombat"
     ],
+    "ERANAMES": [
+      "id\u0151sz\u00e1m\u00edt\u00e1sunk el\u0151tt",
+      "id\u0151sz\u00e1m\u00edt\u00e1sunk szerint"
+    ],
+    "ERAS": [
+      "i. e.",
+      "i. sz."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janu\u00e1r",
       "febru\u00e1r",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y. MMMM d., EEEE",
     "longDate": "y. MMMM d.",
     "medium": "y. MMM d. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_hu.js b/src/ngLocale/angular-locale_hu.js
index b96d7310b7d2..1e61f045e215 100644
--- a/src/ngLocale/angular-locale_hu.js
+++ b/src/ngLocale/angular-locale_hu.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "p\u00e9ntek",
       "szombat"
     ],
+    "ERANAMES": [
+      "id\u0151sz\u00e1m\u00edt\u00e1sunk el\u0151tt",
+      "id\u0151sz\u00e1m\u00edt\u00e1sunk szerint"
+    ],
+    "ERAS": [
+      "i. e.",
+      "i. sz."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janu\u00e1r",
       "febru\u00e1r",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y. MMMM d., EEEE",
     "longDate": "y. MMMM d.",
     "medium": "y. MMM d. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_hy-am.js b/src/ngLocale/angular-locale_hy-am.js
index 111ce69ab4ff..17afd2763bd9 100644
--- a/src/ngLocale/angular-locale_hy-am.js
+++ b/src/ngLocale/angular-locale_hy-am.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0578\u0582\u0580\u0562\u0561\u0569",
       "\u0577\u0561\u0562\u0561\u0569"
     ],
+    "ERANAMES": [
+      "\u0574.\u0569.\u0561.",
+      "\u0574.\u0569."
+    ],
+    "ERAS": [
+      "\u0574.\u0569.\u0561.",
+      "\u0574.\u0569."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0570\u0578\u0582\u0576\u057e\u0561\u0580\u056b",
       "\u0583\u0565\u057f\u0580\u057e\u0561\u0580\u056b",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0576\u0578\u0575",
       "\u0564\u0565\u056f"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u0569. MMMM d, EEEE",
     "longDate": "dd MMMM, y\u0569.",
     "medium": "dd MMM, y\u0569. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_hy.js b/src/ngLocale/angular-locale_hy.js
index d13fbd6b8b6a..c54fe770fdfc 100644
--- a/src/ngLocale/angular-locale_hy.js
+++ b/src/ngLocale/angular-locale_hy.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0578\u0582\u0580\u0562\u0561\u0569",
       "\u0577\u0561\u0562\u0561\u0569"
     ],
+    "ERANAMES": [
+      "\u0574.\u0569.\u0561.",
+      "\u0574.\u0569."
+    ],
+    "ERAS": [
+      "\u0574.\u0569.\u0561.",
+      "\u0574.\u0569."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0570\u0578\u0582\u0576\u057e\u0561\u0580\u056b",
       "\u0583\u0565\u057f\u0580\u057e\u0561\u0580\u056b",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0576\u0578\u0575",
       "\u0564\u0565\u056f"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u0569. MMMM d, EEEE",
     "longDate": "dd MMMM, y\u0569.",
     "medium": "dd MMM, y\u0569. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ia-fr.js b/src/ngLocale/angular-locale_ia-fr.js
index 037b07776ec5..f7b636b34697 100644
--- a/src/ngLocale/angular-locale_ia-fr.js
+++ b/src/ngLocale/angular-locale_ia-fr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venerdi",
       "sabbato"
     ],
+    "ERANAMES": [
+      "ante Christo",
+      "post Christo"
+    ],
+    "ERAS": [
+      "a.Chr.",
+      "p.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januario",
       "februario",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ia.js b/src/ngLocale/angular-locale_ia.js
index 0e23d85da799..38ead226c951 100644
--- a/src/ngLocale/angular-locale_ia.js
+++ b/src/ngLocale/angular-locale_ia.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venerdi",
       "sabbato"
     ],
+    "ERANAMES": [
+      "ante Christo",
+      "post Christo"
+    ],
+    "ERAS": [
+      "a.Chr.",
+      "p.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januario",
       "februario",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_id-id.js b/src/ngLocale/angular-locale_id-id.js
index 5cee7a631874..8324dce6cfa8 100644
--- a/src/ngLocale/angular-locale_id-id.js
+++ b/src/ngLocale/angular-locale_id-id.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Jumat",
       "Sabtu"
     ],
+    "ERANAMES": [
+      "Sebelum Masehi",
+      "M"
+    ],
+    "ERAS": [
+      "SM",
+      "M"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januari",
       "Februari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH.mm.ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_id.js b/src/ngLocale/angular-locale_id.js
index beb909e6ff8a..b91f32dd5c76 100644
--- a/src/ngLocale/angular-locale_id.js
+++ b/src/ngLocale/angular-locale_id.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Jumat",
       "Sabtu"
     ],
+    "ERANAMES": [
+      "Sebelum Masehi",
+      "M"
+    ],
+    "ERAS": [
+      "SM",
+      "M"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januari",
       "Februari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH.mm.ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ig-ng.js b/src/ngLocale/angular-locale_ig-ng.js
index 6c5c2a78421b..0515635b35e2 100644
--- a/src/ngLocale/angular-locale_ig-ng.js
+++ b/src/ngLocale/angular-locale_ig-ng.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Fra\u1ecbdee",
       "Sat\u1ecddee"
     ],
+    "ERANAMES": [
+      "Tupu Kristi",
+      "Af\u1ecd Kristi"
+    ],
+    "ERAS": [
+      "T.K.",
+      "A.K."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Jen\u1ee5war\u1ecb",
       "Febr\u1ee5war\u1ecb",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ig.js b/src/ngLocale/angular-locale_ig.js
index f0408ad25b59..2c9cfe40060f 100644
--- a/src/ngLocale/angular-locale_ig.js
+++ b/src/ngLocale/angular-locale_ig.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Fra\u1ecbdee",
       "Sat\u1ecddee"
     ],
+    "ERANAMES": [
+      "Tupu Kristi",
+      "Af\u1ecd Kristi"
+    ],
+    "ERAS": [
+      "T.K.",
+      "A.K."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Jen\u1ee5war\u1ecb",
       "Febr\u1ee5war\u1ecb",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ii-cn.js b/src/ngLocale/angular-locale_ii-cn.js
index a3fa020e3e90..5cddd2021c72 100644
--- a/src/ngLocale/angular-locale_ii-cn.js
+++ b/src/ngLocale/angular-locale_ii-cn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\ua18f\ua282\ua26c",
       "\ua18f\ua282\ua0d8"
     ],
+    "ERANAMES": [
+      "\ua0c5\ua2ca\ua0bf",
+      "\ua0c5\ua2ca\ua282"
+    ],
+    "ERAS": [
+      "\ua0c5\ua2ca\ua0bf",
+      "\ua0c5\ua2ca\ua282"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\ua2cd\ua1aa",
       "\ua44d\ua1aa",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "11",
       "12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ii.js b/src/ngLocale/angular-locale_ii.js
index 43b1fe5f126e..2b4f22f87b5c 100644
--- a/src/ngLocale/angular-locale_ii.js
+++ b/src/ngLocale/angular-locale_ii.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\ua18f\ua282\ua26c",
       "\ua18f\ua282\ua0d8"
     ],
+    "ERANAMES": [
+      "\ua0c5\ua2ca\ua0bf",
+      "\ua0c5\ua2ca\ua282"
+    ],
+    "ERAS": [
+      "\ua0c5\ua2ca\ua0bf",
+      "\ua0c5\ua2ca\ua282"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\ua2cd\ua1aa",
       "\ua44d\ua1aa",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "11",
       "12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_in.js b/src/ngLocale/angular-locale_in.js
index b753337624fa..f9d523aee674 100644
--- a/src/ngLocale/angular-locale_in.js
+++ b/src/ngLocale/angular-locale_in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Jumat",
       "Sabtu"
     ],
+    "ERANAMES": [
+      "Sebelum Masehi",
+      "M"
+    ],
+    "ERAS": [
+      "SM",
+      "M"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januari",
       "Februari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH.mm.ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_is-is.js b/src/ngLocale/angular-locale_is-is.js
index 23a35b33d789..b38bd19fe2df 100644
--- a/src/ngLocale/angular-locale_is-is.js
+++ b/src/ngLocale/angular-locale_is-is.js
@@ -47,6 +47,15 @@ $provide.value("$locale", {
       "f\u00f6studagur",
       "laugardagur"
     ],
+    "ERANAMES": [
+      "fyrir Krist",
+      "eftir Krist"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "jan\u00faar",
       "febr\u00faar",
@@ -84,6 +93,10 @@ $provide.value("$locale", {
       "n\u00f3v.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_is.js b/src/ngLocale/angular-locale_is.js
index 92ea48a7d985..5b3ad4313a56 100644
--- a/src/ngLocale/angular-locale_is.js
+++ b/src/ngLocale/angular-locale_is.js
@@ -47,6 +47,15 @@ $provide.value("$locale", {
       "f\u00f6studagur",
       "laugardagur"
     ],
+    "ERANAMES": [
+      "fyrir Krist",
+      "eftir Krist"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "jan\u00faar",
       "febr\u00faar",
@@ -84,6 +93,10 @@ $provide.value("$locale", {
       "n\u00f3v.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_it-ch.js b/src/ngLocale/angular-locale_it-ch.js
index 8fd937b0a7b8..1adbbe48eeb3 100644
--- a/src/ngLocale/angular-locale_it-ch.js
+++ b/src/ngLocale/angular-locale_it-ch.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venerd\u00ec",
       "sabato"
     ],
+    "ERANAMES": [
+      "a.C.",
+      "d.C."
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "gennaio",
       "febbraio",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dic"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d-MMM-y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_it-it.js b/src/ngLocale/angular-locale_it-it.js
index 148ec8a5de7a..f02cc459f1b8 100644
--- a/src/ngLocale/angular-locale_it-it.js
+++ b/src/ngLocale/angular-locale_it-it.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venerd\u00ec",
       "sabato"
     ],
+    "ERANAMES": [
+      "a.C.",
+      "d.C."
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "gennaio",
       "febbraio",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dic"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_it-sm.js b/src/ngLocale/angular-locale_it-sm.js
index 6fe34b010072..5ee2ce18efd3 100644
--- a/src/ngLocale/angular-locale_it-sm.js
+++ b/src/ngLocale/angular-locale_it-sm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venerd\u00ec",
       "sabato"
     ],
+    "ERANAMES": [
+      "a.C.",
+      "d.C."
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "gennaio",
       "febbraio",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dic"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_it.js b/src/ngLocale/angular-locale_it.js
index 14389ca38f78..b4b5e4e590e6 100644
--- a/src/ngLocale/angular-locale_it.js
+++ b/src/ngLocale/angular-locale_it.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venerd\u00ec",
       "sabato"
     ],
+    "ERANAMES": [
+      "a.C.",
+      "d.C."
+    ],
+    "ERAS": [
+      "aC",
+      "dC"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "gennaio",
       "febbraio",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dic"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_iw.js b/src/ngLocale/angular-locale_iw.js
index 5c7ef23dbf90..02622c14cbb0 100644
--- a/src/ngLocale/angular-locale_iw.js
+++ b/src/ngLocale/angular-locale_iw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u05d9\u05d5\u05dd \u05e9\u05d9\u05e9\u05d9",
       "\u05d9\u05d5\u05dd \u05e9\u05d1\u05ea"
     ],
+    "ERANAMES": [
+      "\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e1\u05e4\u05d9\u05e8\u05d4",
+      "\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4"
+    ],
+    "ERAS": [
+      "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e1",
+      "\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u05d9\u05e0\u05d5\u05d0\u05e8",
       "\u05e4\u05d1\u05e8\u05d5\u05d0\u05e8",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "\u05e0\u05d5\u05d1\u05f3",
       "\u05d3\u05e6\u05de\u05f3"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE, d \u05d1MMMM y",
     "longDate": "d \u05d1MMMM y",
-    "medium": "d \u05d1MMM y HH:mm:ss",
+    "medium": "d \u05d1MMM y H:mm:ss",
     "mediumDate": "d \u05d1MMM y",
-    "mediumTime": "HH:mm:ss",
-    "short": "d.M.y HH:mm",
+    "mediumTime": "H:mm:ss",
+    "short": "d.M.y H:mm",
     "shortDate": "d.M.y",
-    "shortTime": "HH:mm"
+    "shortTime": "H:mm"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u20aa",
diff --git a/src/ngLocale/angular-locale_ja-jp.js b/src/ngLocale/angular-locale_ja-jp.js
index 865642fe04dd..78cd06948eb4 100644
--- a/src/ngLocale/angular-locale_ja-jp.js
+++ b/src/ngLocale/angular-locale_ja-jp.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u91d1\u66dc\u65e5",
       "\u571f\u66dc\u65e5"
     ],
+    "ERANAMES": [
+      "\u7d00\u5143\u524d",
+      "\u897f\u66a6"
+    ],
+    "ERAS": [
+      "\u7d00\u5143\u524d",
+      "\u897f\u66a6"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\u6708",
       "2\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y/MM/dd H:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ja.js b/src/ngLocale/angular-locale_ja.js
index 583822b0aad2..0011b5cc3337 100644
--- a/src/ngLocale/angular-locale_ja.js
+++ b/src/ngLocale/angular-locale_ja.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u91d1\u66dc\u65e5",
       "\u571f\u66dc\u65e5"
     ],
+    "ERANAMES": [
+      "\u7d00\u5143\u524d",
+      "\u897f\u66a6"
+    ],
+    "ERAS": [
+      "\u7d00\u5143\u524d",
+      "\u897f\u66a6"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\u6708",
       "2\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y/MM/dd H:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_jgo-cm.js b/src/ngLocale/angular-locale_jgo-cm.js
index 63a1e22ca77b..ae05a5a7efce 100644
--- a/src/ngLocale/angular-locale_jgo-cm.js
+++ b/src/ngLocale/angular-locale_jgo-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "F\u025bl\u00e2y\u025bd\u025b",
       "S\u00e1sid\u025b"
     ],
+    "ERANAMES": [
+      "ts\u025btts\u025bt m\u025b\u014bgu\ua78c mi \u025b\u0301 l\u025b\u025bn\u025b K\u025bl\u00eds\u025bt\u0254 g\u0254 \u0144\u0254\u0301",
+      "ts\u025btts\u025bt m\u025b\u014bgu\ua78c mi \u025b\u0301 f\u00fan\u025b K\u025bl\u00eds\u025bt\u0254 t\u0254\u0301 m\u0254\u0301"
+    ],
+    "ERAS": [
+      "ts\u025btts\u025bt m\u025b\u014bgu\ua78c mi \u025b\u0301 l\u025b\u025bn\u025b K\u025bl\u00eds\u025bt\u0254 g\u0254 \u0144\u0254\u0301",
+      "ts\u025btts\u025bt m\u025b\u014bgu\ua78c mi \u025b\u0301 f\u00fan\u025b K\u025bl\u00eds\u025bt\u0254 t\u0254\u0301 m\u0254\u0301"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ndu\u014bmbi Sa\u014b",
       "P\u025bsa\u014b P\u025b\u0301p\u00e1",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "P\u025bsa\u014b Nts\u0254\u030cpm\u0254\u0301",
       "P\u025bsa\u014b Nts\u0254\u030cpp\u00e1"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_jgo.js b/src/ngLocale/angular-locale_jgo.js
index c2d203b16510..f27c22c3836f 100644
--- a/src/ngLocale/angular-locale_jgo.js
+++ b/src/ngLocale/angular-locale_jgo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "F\u025bl\u00e2y\u025bd\u025b",
       "S\u00e1sid\u025b"
     ],
+    "ERANAMES": [
+      "ts\u025btts\u025bt m\u025b\u014bgu\ua78c mi \u025b\u0301 l\u025b\u025bn\u025b K\u025bl\u00eds\u025bt\u0254 g\u0254 \u0144\u0254\u0301",
+      "ts\u025btts\u025bt m\u025b\u014bgu\ua78c mi \u025b\u0301 f\u00fan\u025b K\u025bl\u00eds\u025bt\u0254 t\u0254\u0301 m\u0254\u0301"
+    ],
+    "ERAS": [
+      "ts\u025btts\u025bt m\u025b\u014bgu\ua78c mi \u025b\u0301 l\u025b\u025bn\u025b K\u025bl\u00eds\u025bt\u0254 g\u0254 \u0144\u0254\u0301",
+      "ts\u025btts\u025bt m\u025b\u014bgu\ua78c mi \u025b\u0301 f\u00fan\u025b K\u025bl\u00eds\u025bt\u0254 t\u0254\u0301 m\u0254\u0301"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ndu\u014bmbi Sa\u014b",
       "P\u025bsa\u014b P\u025b\u0301p\u00e1",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "P\u025bsa\u014b Nts\u0254\u030cpm\u0254\u0301",
       "P\u025bsa\u014b Nts\u0254\u030cpp\u00e1"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_jmc-tz.js b/src/ngLocale/angular-locale_jmc-tz.js
index 39c0cff518c2..8eff91dfe0c8 100644
--- a/src/ngLocale/angular-locale_jmc-tz.js
+++ b/src/ngLocale/angular-locale_jmc-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristu",
+      "Baada ya Kristu"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_jmc.js b/src/ngLocale/angular-locale_jmc.js
index 112be477a4e4..dd754e93de64 100644
--- a/src/ngLocale/angular-locale_jmc.js
+++ b/src/ngLocale/angular-locale_jmc.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristu",
+      "Baada ya Kristu"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ka-ge.js b/src/ngLocale/angular-locale_ka-ge.js
index d234e777ca0c..4383940aa5c7 100644
--- a/src/ngLocale/angular-locale_ka-ge.js
+++ b/src/ngLocale/angular-locale_ka-ge.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u10de\u10d0\u10e0\u10d0\u10e1\u10d9\u10d4\u10d5\u10d8",
       "\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8"
     ],
+    "ERANAMES": [
+      "\u10eb\u10d5\u10d4\u10da\u10d8 \u10ec\u10d4\u10da\u10d7\u10d0\u10e6\u10e0\u10d8\u10ea\u10ee\u10d5\u10d8\u10d7",
+      "\u10d0\u10ee\u10d0\u10da\u10d8 \u10ec\u10d4\u10da\u10d7\u10d0\u10e6\u10e0\u10d8\u10ea\u10ee\u10d5\u10d8\u10d7"
+    ],
+    "ERAS": [
+      "\u10eb\u10d5. \u10ec.",
+      "\u10d0\u10ee. \u10ec."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u10d8\u10d0\u10dc\u10d5\u10d0\u10e0\u10d8",
       "\u10d7\u10d4\u10d1\u10d4\u10e0\u10d5\u10d0\u10da\u10d8",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u10dc\u10dd\u10d4",
       "\u10d3\u10d4\u10d9"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ka.js b/src/ngLocale/angular-locale_ka.js
index cd4a0b78dfaa..fc846caeac23 100644
--- a/src/ngLocale/angular-locale_ka.js
+++ b/src/ngLocale/angular-locale_ka.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u10de\u10d0\u10e0\u10d0\u10e1\u10d9\u10d4\u10d5\u10d8",
       "\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8"
     ],
+    "ERANAMES": [
+      "\u10eb\u10d5\u10d4\u10da\u10d8 \u10ec\u10d4\u10da\u10d7\u10d0\u10e6\u10e0\u10d8\u10ea\u10ee\u10d5\u10d8\u10d7",
+      "\u10d0\u10ee\u10d0\u10da\u10d8 \u10ec\u10d4\u10da\u10d7\u10d0\u10e6\u10e0\u10d8\u10ea\u10ee\u10d5\u10d8\u10d7"
+    ],
+    "ERAS": [
+      "\u10eb\u10d5. \u10ec.",
+      "\u10d0\u10ee. \u10ec."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u10d8\u10d0\u10dc\u10d5\u10d0\u10e0\u10d8",
       "\u10d7\u10d4\u10d1\u10d4\u10e0\u10d5\u10d0\u10da\u10d8",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u10dc\u10dd\u10d4",
       "\u10d3\u10d4\u10d9"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_kab-dz.js b/src/ngLocale/angular-locale_kab-dz.js
index 44445be6d2e7..6063c588f24b 100644
--- a/src/ngLocale/angular-locale_kab-dz.js
+++ b/src/ngLocale/angular-locale_kab-dz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "S\u1e0disass",
       "Sayass"
     ],
+    "ERANAMES": [
+      "send talalit n \u0190isa",
+      "seld talalit n \u0190isa"
+    ],
+    "ERAS": [
+      "snd. T.\u0190",
+      "sld. T.\u0190"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Yennayer",
       "Fu\u1e5bar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nun",
       "Du\u01e7"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_kab.js b/src/ngLocale/angular-locale_kab.js
index 8e6f29073663..d7b82a94e863 100644
--- a/src/ngLocale/angular-locale_kab.js
+++ b/src/ngLocale/angular-locale_kab.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "S\u1e0disass",
       "Sayass"
     ],
+    "ERANAMES": [
+      "send talalit n \u0190isa",
+      "seld talalit n \u0190isa"
+    ],
+    "ERAS": [
+      "snd. T.\u0190",
+      "sld. T.\u0190"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Yennayer",
       "Fu\u1e5bar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nun",
       "Du\u01e7"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_kam-ke.js b/src/ngLocale/angular-locale_kam-ke.js
index 0c98f99f11ea..669f17f152d6 100644
--- a/src/ngLocale/angular-locale_kam-ke.js
+++ b/src/ngLocale/angular-locale_kam-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Wa katano",
       "Wa thanthat\u0169"
     ],
+    "ERANAMES": [
+      "Mbee wa Yes\u0169",
+      "\u0128tina wa Yes\u0169"
+    ],
+    "ERAS": [
+      "MY",
+      "IY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mwai wa mbee",
       "Mwai wa kel\u0129",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0128km",
       "\u0128kl"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kam.js b/src/ngLocale/angular-locale_kam.js
index 8a30b19dbbfb..f099840034ec 100644
--- a/src/ngLocale/angular-locale_kam.js
+++ b/src/ngLocale/angular-locale_kam.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Wa katano",
       "Wa thanthat\u0169"
     ],
+    "ERANAMES": [
+      "Mbee wa Yes\u0169",
+      "\u0128tina wa Yes\u0169"
+    ],
+    "ERAS": [
+      "MY",
+      "IY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mwai wa mbee",
       "Mwai wa kel\u0129",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0128km",
       "\u0128kl"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kde-tz.js b/src/ngLocale/angular-locale_kde-tz.js
index 472033f2aca5..0363929f49dc 100644
--- a/src/ngLocale/angular-locale_kde-tz.js
+++ b/src/ngLocale/angular-locale_kde-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Liduva lyannyano na mavili",
       "Liduva litandi"
     ],
+    "ERANAMES": [
+      "Akanapawa Yesu",
+      "Nankuida Yesu"
+    ],
+    "ERAS": [
+      "AY",
+      "NY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mwedi Ntandi",
       "Mwedi wa Pili",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kde.js b/src/ngLocale/angular-locale_kde.js
index 4b322c3f46e2..6dcc55eb6075 100644
--- a/src/ngLocale/angular-locale_kde.js
+++ b/src/ngLocale/angular-locale_kde.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Liduva lyannyano na mavili",
       "Liduva litandi"
     ],
+    "ERANAMES": [
+      "Akanapawa Yesu",
+      "Nankuida Yesu"
+    ],
+    "ERAS": [
+      "AY",
+      "NY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mwedi Ntandi",
       "Mwedi wa Pili",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kea-cv.js b/src/ngLocale/angular-locale_kea-cv.js
index 6850856c874b..1fc8d8e68348 100644
--- a/src/ngLocale/angular-locale_kea-cv.js
+++ b/src/ngLocale/angular-locale_kea-cv.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "sesta-fera",
       "sabadu"
     ],
+    "ERANAMES": [
+      "Antis di Kristu",
+      "Dispos di Kristu"
+    ],
+    "ERAS": [
+      "AK",
+      "DK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janeru",
       "Febreru",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nuv",
       "Diz"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'di' MMMM 'di' y",
     "longDate": "d 'di' MMMM 'di' y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_kea.js b/src/ngLocale/angular-locale_kea.js
index 30f40f37d4da..0bab114dd5b5 100644
--- a/src/ngLocale/angular-locale_kea.js
+++ b/src/ngLocale/angular-locale_kea.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "sesta-fera",
       "sabadu"
     ],
+    "ERANAMES": [
+      "Antis di Kristu",
+      "Dispos di Kristu"
+    ],
+    "ERAS": [
+      "AK",
+      "DK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janeru",
       "Febreru",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nuv",
       "Diz"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'di' MMMM 'di' y",
     "longDate": "d 'di' MMMM 'di' y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_khq-ml.js b/src/ngLocale/angular-locale_khq-ml.js
index 73b3888acda3..328809e19552 100644
--- a/src/ngLocale/angular-locale_khq-ml.js
+++ b/src/ngLocale/angular-locale_khq-ml.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Aljuma",
       "Assabdu"
     ],
+    "ERANAMES": [
+      "Isaa jine",
+      "Isaa jamanoo"
+    ],
+    "ERAS": [
+      "IJ",
+      "IZ"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u017danwiye",
       "Feewiriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Noo",
       "Dee"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_khq.js b/src/ngLocale/angular-locale_khq.js
index 2edec9a7036a..90fa7e6bb33c 100644
--- a/src/ngLocale/angular-locale_khq.js
+++ b/src/ngLocale/angular-locale_khq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Aljuma",
       "Assabdu"
     ],
+    "ERANAMES": [
+      "Isaa jine",
+      "Isaa jamanoo"
+    ],
+    "ERAS": [
+      "IJ",
+      "IZ"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u017danwiye",
       "Feewiriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Noo",
       "Dee"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ki-ke.js b/src/ngLocale/angular-locale_ki-ke.js
index 104a6ce01a18..c8d312b7a4bf 100644
--- a/src/ngLocale/angular-locale_ki-ke.js
+++ b/src/ngLocale/angular-locale_ki-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Njumaa",
       "Njumamothi"
     ],
+    "ERANAMES": [
+      "Mbere ya Kristo",
+      "Thutha wa Kristo"
+    ],
+    "ERAS": [
+      "MK",
+      "TK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Njenuar\u0129",
       "Mwere wa ker\u0129",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "WMW",
       "DIT"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ki.js b/src/ngLocale/angular-locale_ki.js
index e25e6439315e..b21103da2c1b 100644
--- a/src/ngLocale/angular-locale_ki.js
+++ b/src/ngLocale/angular-locale_ki.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Njumaa",
       "Njumamothi"
     ],
+    "ERANAMES": [
+      "Mbere ya Kristo",
+      "Thutha wa Kristo"
+    ],
+    "ERAS": [
+      "MK",
+      "TK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Njenuar\u0129",
       "Mwere wa ker\u0129",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "WMW",
       "DIT"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kk-cyrl-kz.js b/src/ngLocale/angular-locale_kk-cyrl-kz.js
index 367b96f17517..828abbf4f6f8 100644
--- a/src/ngLocale/angular-locale_kk-cyrl-kz.js
+++ b/src/ngLocale/angular-locale_kk-cyrl-kz.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0436\u04b1\u043c\u0430",
       "\u0441\u0435\u043d\u0431\u0456"
     ],
+    "ERANAMES": [
+      "\u0411\u0456\u0437\u0434\u0456\u04a3 \u0437\u0430\u043c\u0430\u043d\u044b\u043c\u044b\u0437\u0493\u0430 \u0434\u0435\u0439\u0456\u043d",
+      "\u0411\u0456\u0437\u0434\u0456\u04a3 \u0437\u0430\u043c\u0430\u043d\u044b\u043c\u044b\u0437"
+    ],
+    "ERAS": [
+      "\u0431.\u0437.\u0434.",
+      "\u0431.\u0437."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u049b\u0430\u04a3\u0442\u0430\u0440",
       "\u0430\u049b\u043f\u0430\u043d",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u049b\u0430\u0440.",
       "\u0436\u0435\u043b\u0442."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "y, dd-MMM HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_kk-cyrl.js b/src/ngLocale/angular-locale_kk-cyrl.js
index a427fa6e42ea..321fad886cf1 100644
--- a/src/ngLocale/angular-locale_kk-cyrl.js
+++ b/src/ngLocale/angular-locale_kk-cyrl.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0436\u04b1\u043c\u0430",
       "\u0441\u0435\u043d\u0431\u0456"
     ],
+    "ERANAMES": [
+      "\u0411\u0456\u0437\u0434\u0456\u04a3 \u0437\u0430\u043c\u0430\u043d\u044b\u043c\u044b\u0437\u0493\u0430 \u0434\u0435\u0439\u0456\u043d",
+      "\u0411\u0456\u0437\u0434\u0456\u04a3 \u0437\u0430\u043c\u0430\u043d\u044b\u043c\u044b\u0437"
+    ],
+    "ERAS": [
+      "\u0431.\u0437.\u0434.",
+      "\u0431.\u0437."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u049b\u0430\u04a3\u0442\u0430\u0440",
       "\u0430\u049b\u043f\u0430\u043d",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u049b\u0430\u0440.",
       "\u0436\u0435\u043b\u0442."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "y, dd-MMM HH:mm:ss",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "\u20b8",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": "\u00a0",
     "PATTERNS": [
diff --git a/src/ngLocale/angular-locale_kk.js b/src/ngLocale/angular-locale_kk.js
index 9de608770ead..3d4a44e0c7e1 100644
--- a/src/ngLocale/angular-locale_kk.js
+++ b/src/ngLocale/angular-locale_kk.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0436\u04b1\u043c\u0430",
       "\u0441\u0435\u043d\u0431\u0456"
     ],
+    "ERANAMES": [
+      "\u0411\u0456\u0437\u0434\u0456\u04a3 \u0437\u0430\u043c\u0430\u043d\u044b\u043c\u044b\u0437\u0493\u0430 \u0434\u0435\u0439\u0456\u043d",
+      "\u0411\u0456\u0437\u0434\u0456\u04a3 \u0437\u0430\u043c\u0430\u043d\u044b\u043c\u044b\u0437"
+    ],
+    "ERAS": [
+      "\u0431.\u0437.\u0434.",
+      "\u0431.\u0437."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u049b\u0430\u04a3\u0442\u0430\u0440",
       "\u0430\u049b\u043f\u0430\u043d",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u049b\u0430\u0440.",
       "\u0436\u0435\u043b\u0442."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "y, dd-MMM HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_kkj-cm.js b/src/ngLocale/angular-locale_kkj-cm.js
index b305e9d21bd7..8b2a2538793b 100644
--- a/src/ngLocale/angular-locale_kkj-cm.js
+++ b/src/ngLocale/angular-locale_kkj-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "va\u014bd\u025br\u025bdi",
       "m\u0254n\u0254 s\u0254ndi"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "pamba",
       "wanja",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "11",
       "\u0253ul\u0253us\u025b"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kkj.js b/src/ngLocale/angular-locale_kkj.js
index f452b4c2ae67..dc0b25ad01d5 100644
--- a/src/ngLocale/angular-locale_kkj.js
+++ b/src/ngLocale/angular-locale_kkj.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "va\u014bd\u025br\u025bdi",
       "m\u0254n\u0254 s\u0254ndi"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "pamba",
       "wanja",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "11",
       "\u0253ul\u0253us\u025b"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kl-gl.js b/src/ngLocale/angular-locale_kl-gl.js
index 3177652460ea..3b3e77d0433b 100644
--- a/src/ngLocale/angular-locale_kl-gl.js
+++ b/src/ngLocale/angular-locale_kl-gl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "tallimanngorneq",
       "arfininngorneq"
     ],
+    "ERANAMES": [
+      "Kristusip inunngornerata siornagut",
+      "Kristusip inunngornerata kingornagut"
+    ],
+    "ERAS": [
+      "Kr.in.si.",
+      "Kr.in.king."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "MMM dd, y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_kl.js b/src/ngLocale/angular-locale_kl.js
index 4d0c9889a8ef..a20a1950b4d3 100644
--- a/src/ngLocale/angular-locale_kl.js
+++ b/src/ngLocale/angular-locale_kl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "tallimanngorneq",
       "arfininngorneq"
     ],
+    "ERANAMES": [
+      "Kristusip inunngornerata siornagut",
+      "Kristusip inunngornerata kingornagut"
+    ],
+    "ERAS": [
+      "Kr.in.si.",
+      "Kr.in.king."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "MMM dd, y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_kln-ke.js b/src/ngLocale/angular-locale_kln-ke.js
index dd6b1fc2477d..41e740503b19 100644
--- a/src/ngLocale/angular-locale_kln-ke.js
+++ b/src/ngLocale/angular-locale_kln-ke.js
@@ -22,54 +22,67 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "Beet",
-      "Kemo"
+      "karoon",
+      "kooskoliny"
     ],
     "DAY": [
-      "Betutab tisap",
-      "Betut netai",
-      "Betutab aeng\u2019",
-      "Betutab somok",
-      "Betutab ang\u2019wan",
-      "Betutab mut",
-      "Betutab lo"
+      "Kotisap",
+      "Kotaai",
+      "Koaeng\u2019",
+      "Kosomok",
+      "Koang\u2019wan",
+      "Komuut",
+      "Kolo"
     ],
+    "ERANAMES": [
+      "Amait kesich Jesu",
+      "Kokakesich Jesu"
+    ],
+    "ERAS": [
+      "AM",
+      "KO"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mulgul",
-      "Ng\u2019atyato",
-      "Kiptamo",
-      "Iwat kut",
-      "Ng\u2019eiyet",
-      "Waki",
-      "Roptui",
-      "Kipkogaga",
-      "Buret",
-      "Epeso",
-      "Kipsunde netai",
-      "Kipsunde nebo aeng"
+      "Ng\u2019atyaato",
+      "Kiptaamo",
+      "Iwootkuut",
+      "Mamuut",
+      "Paagi",
+      "Ng\u2019eiyeet",
+      "Rooptui",
+      "Bureet",
+      "Epeeso",
+      "Kipsuunde ne taai",
+      "Kipsuunde nebo aeng\u2019"
     ],
     "SHORTDAY": [
-      "Tis",
-      "Tai",
-      "Aen",
-      "Som",
-      "Ang",
-      "Mut",
-      "Loh"
+      "Kts",
+      "Kot",
+      "Koo",
+      "Kos",
+      "Koa",
+      "Kom",
+      "Kol"
     ],
     "SHORTMONTH": [
       "Mul",
-      "Nga",
-      "Kip",
-      "Iwa",
+      "Ngat",
+      "Taa",
+      "Iwo",
+      "Mam",
+      "Paa",
       "Nge",
-      "Wak",
-      "Rop",
-      "Kog",
+      "Roo",
       "Bur",
       "Epe",
-      "Tai",
-      "Aen"
+      "Kpt",
+      "Kpa"
+    ],
+    "WEEKENDRANGE": [
+      5,
+      6
     ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kln.js b/src/ngLocale/angular-locale_kln.js
index c14ba19d4c75..973b711f84b8 100644
--- a/src/ngLocale/angular-locale_kln.js
+++ b/src/ngLocale/angular-locale_kln.js
@@ -22,54 +22,67 @@ function getVF(n, opt_precision) {
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "Beet",
-      "Kemo"
+      "karoon",
+      "kooskoliny"
     ],
     "DAY": [
-      "Betutab tisap",
-      "Betut netai",
-      "Betutab aeng\u2019",
-      "Betutab somok",
-      "Betutab ang\u2019wan",
-      "Betutab mut",
-      "Betutab lo"
+      "Kotisap",
+      "Kotaai",
+      "Koaeng\u2019",
+      "Kosomok",
+      "Koang\u2019wan",
+      "Komuut",
+      "Kolo"
     ],
+    "ERANAMES": [
+      "Amait kesich Jesu",
+      "Kokakesich Jesu"
+    ],
+    "ERAS": [
+      "AM",
+      "KO"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mulgul",
-      "Ng\u2019atyato",
-      "Kiptamo",
-      "Iwat kut",
-      "Ng\u2019eiyet",
-      "Waki",
-      "Roptui",
-      "Kipkogaga",
-      "Buret",
-      "Epeso",
-      "Kipsunde netai",
-      "Kipsunde nebo aeng"
+      "Ng\u2019atyaato",
+      "Kiptaamo",
+      "Iwootkuut",
+      "Mamuut",
+      "Paagi",
+      "Ng\u2019eiyeet",
+      "Rooptui",
+      "Bureet",
+      "Epeeso",
+      "Kipsuunde ne taai",
+      "Kipsuunde nebo aeng\u2019"
     ],
     "SHORTDAY": [
-      "Tis",
-      "Tai",
-      "Aen",
-      "Som",
-      "Ang",
-      "Mut",
-      "Loh"
+      "Kts",
+      "Kot",
+      "Koo",
+      "Kos",
+      "Koa",
+      "Kom",
+      "Kol"
     ],
     "SHORTMONTH": [
       "Mul",
-      "Nga",
-      "Kip",
-      "Iwa",
+      "Ngat",
+      "Taa",
+      "Iwo",
+      "Mam",
+      "Paa",
       "Nge",
-      "Wak",
-      "Rop",
-      "Kog",
+      "Roo",
       "Bur",
       "Epe",
-      "Tai",
-      "Aen"
+      "Kpt",
+      "Kpa"
+    ],
+    "WEEKENDRANGE": [
+      5,
+      6
     ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_km-kh.js b/src/ngLocale/angular-locale_km-kh.js
index 9e1eb22fea83..43649cd6dc80 100644
--- a/src/ngLocale/angular-locale_km-kh.js
+++ b/src/ngLocale/angular-locale_km-kh.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u179f\u17bb\u1780\u17d2\u179a",
       "\u179f\u17c5\u179a\u17cd"
     ],
+    "ERANAMES": [
+      "\u1798\u17bb\u1793\u200b\u1782\u17d2\u179a\u17b7\u179f\u17d2\u178f\u179f\u1780\u179a\u17b6\u1787",
+      "\u1782\u17d2\u179a\u17b7\u179f\u17d2\u178f\u179f\u1780\u179a\u17b6\u1787"
+    ],
+    "ERAS": [
+      "\u1798\u17bb\u1793 \u1782.\u179f.",
+      "\u1782.\u179f."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u1798\u1780\u179a\u17b6",
       "\u1780\u17bb\u1798\u17d2\u1797\u17c8",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u179c\u17b7\u1785\u17d2\u1786\u17b7\u1780\u17b6",
       "\u1792\u17d2\u1793\u17bc"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_km.js b/src/ngLocale/angular-locale_km.js
index 879247bcb9f7..ee21ccc1a96b 100644
--- a/src/ngLocale/angular-locale_km.js
+++ b/src/ngLocale/angular-locale_km.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u179f\u17bb\u1780\u17d2\u179a",
       "\u179f\u17c5\u179a\u17cd"
     ],
+    "ERANAMES": [
+      "\u1798\u17bb\u1793\u200b\u1782\u17d2\u179a\u17b7\u179f\u17d2\u178f\u179f\u1780\u179a\u17b6\u1787",
+      "\u1782\u17d2\u179a\u17b7\u179f\u17d2\u178f\u179f\u1780\u179a\u17b6\u1787"
+    ],
+    "ERAS": [
+      "\u1798\u17bb\u1793 \u1782.\u179f.",
+      "\u1782.\u179f."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u1798\u1780\u179a\u17b6",
       "\u1780\u17bb\u1798\u17d2\u1797\u17c8",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u179c\u17b7\u1785\u17d2\u1786\u17b7\u1780\u17b6",
       "\u1792\u17d2\u1793\u17bc"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kn-in.js b/src/ngLocale/angular-locale_kn-in.js
index e61f6cf0b52d..59f60a75c8e5 100644
--- a/src/ngLocale/angular-locale_kn-in.js
+++ b/src/ngLocale/angular-locale_kn-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0cb6\u0cc1\u0c95\u0ccd\u0cb0\u0cb5\u0cbe\u0cb0",
       "\u0cb6\u0ca8\u0cbf\u0cb5\u0cbe\u0cb0"
     ],
+    "ERANAMES": [
+      "\u0c95\u0ccd\u0cb0\u0cbf\u0cb8\u0ccd\u0ca4 \u0caa\u0cc2\u0cb0\u0ccd\u0cb5",
+      "\u0c95\u0ccd\u0cb0\u0cbf\u0cb8\u0ccd\u0ca4 \u0cb6\u0c95"
+    ],
+    "ERAS": [
+      "\u0c95\u0ccd\u0cb0\u0cbf.\u0caa\u0cc2",
+      "\u0c95\u0ccd\u0cb0\u0cbf.\u0cb6"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0c9c\u0ca8\u0cb5\u0cb0\u0cbf",
       "\u0cab\u0cc6\u0cac\u0ccd\u0cb0\u0cb5\u0cb0\u0cbf",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0ca8\u0cb5\u0cc6\u0c82",
       "\u0ca1\u0cbf\u0cb8\u0cc6\u0c82"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y hh:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kn.js b/src/ngLocale/angular-locale_kn.js
index 6d9cdd12d7a4..4dcebb61cb5d 100644
--- a/src/ngLocale/angular-locale_kn.js
+++ b/src/ngLocale/angular-locale_kn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0cb6\u0cc1\u0c95\u0ccd\u0cb0\u0cb5\u0cbe\u0cb0",
       "\u0cb6\u0ca8\u0cbf\u0cb5\u0cbe\u0cb0"
     ],
+    "ERANAMES": [
+      "\u0c95\u0ccd\u0cb0\u0cbf\u0cb8\u0ccd\u0ca4 \u0caa\u0cc2\u0cb0\u0ccd\u0cb5",
+      "\u0c95\u0ccd\u0cb0\u0cbf\u0cb8\u0ccd\u0ca4 \u0cb6\u0c95"
+    ],
+    "ERAS": [
+      "\u0c95\u0ccd\u0cb0\u0cbf.\u0caa\u0cc2",
+      "\u0c95\u0ccd\u0cb0\u0cbf.\u0cb6"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0c9c\u0ca8\u0cb5\u0cb0\u0cbf",
       "\u0cab\u0cc6\u0cac\u0ccd\u0cb0\u0cb5\u0cb0\u0cbf",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0ca8\u0cb5\u0cc6\u0c82",
       "\u0ca1\u0cbf\u0cb8\u0cc6\u0c82"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y hh:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ko-kp.js b/src/ngLocale/angular-locale_ko-kp.js
index b4d9776343a7..61ae2b1be5c8 100644
--- a/src/ngLocale/angular-locale_ko-kp.js
+++ b/src/ngLocale/angular-locale_ko-kp.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\uae08\uc694\uc77c",
       "\ud1a0\uc694\uc77c"
     ],
+    "ERANAMES": [
+      "\uae30\uc6d0\uc804",
+      "\uc11c\uae30"
+    ],
+    "ERAS": [
+      "\uae30\uc6d0\uc804",
+      "\uc11c\uae30"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "1\uc6d4",
       "2\uc6d4",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\uc6d4",
       "12\uc6d4"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\ub144 M\uc6d4 d\uc77c EEEE",
     "longDate": "y\ub144 M\uc6d4 d\uc77c",
     "medium": "y. M. d. a h:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ko-kr.js b/src/ngLocale/angular-locale_ko-kr.js
index c1336a102523..004a2d8db71f 100644
--- a/src/ngLocale/angular-locale_ko-kr.js
+++ b/src/ngLocale/angular-locale_ko-kr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\uae08\uc694\uc77c",
       "\ud1a0\uc694\uc77c"
     ],
+    "ERANAMES": [
+      "\uae30\uc6d0\uc804",
+      "\uc11c\uae30"
+    ],
+    "ERAS": [
+      "\uae30\uc6d0\uc804",
+      "\uc11c\uae30"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\uc6d4",
       "2\uc6d4",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\uc6d4",
       "12\uc6d4"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\ub144 M\uc6d4 d\uc77c EEEE",
     "longDate": "y\ub144 M\uc6d4 d\uc77c",
     "medium": "y. M. d. a h:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ko.js b/src/ngLocale/angular-locale_ko.js
index 26d69d811e4b..b9c6fea38abf 100644
--- a/src/ngLocale/angular-locale_ko.js
+++ b/src/ngLocale/angular-locale_ko.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\uae08\uc694\uc77c",
       "\ud1a0\uc694\uc77c"
     ],
+    "ERANAMES": [
+      "\uae30\uc6d0\uc804",
+      "\uc11c\uae30"
+    ],
+    "ERAS": [
+      "\uae30\uc6d0\uc804",
+      "\uc11c\uae30"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\uc6d4",
       "2\uc6d4",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\uc6d4",
       "12\uc6d4"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\ub144 M\uc6d4 d\uc77c EEEE",
     "longDate": "y\ub144 M\uc6d4 d\uc77c",
     "medium": "y. M. d. a h:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kok-in.js b/src/ngLocale/angular-locale_kok-in.js
index b9490846ef90..fde838b73260 100644
--- a/src/ngLocale/angular-locale_kok-in.js
+++ b/src/ngLocale/angular-locale_kok-in.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930",
       "\u0936\u0928\u093f\u0935\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u092a\u0942\u0930\u094d\u0935",
+      "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u0936\u0916\u093e"
+    ],
+    "ERAS": [
+      "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u092a\u0942\u0930\u094d\u0935",
+      "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u0936\u0916\u093e"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940",
       "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930",
       "\u0921\u093f\u0938\u0947\u0902\u092c\u0930"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd-MM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kok.js b/src/ngLocale/angular-locale_kok.js
index d2f2ffa00b13..701c8f7e0844 100644
--- a/src/ngLocale/angular-locale_kok.js
+++ b/src/ngLocale/angular-locale_kok.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930",
       "\u0936\u0928\u093f\u0935\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u092a\u0942\u0930\u094d\u0935",
+      "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u0936\u0916\u093e"
+    ],
+    "ERAS": [
+      "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u092a\u0942\u0930\u094d\u0935",
+      "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u0936\u0916\u093e"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940",
       "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930",
       "\u0921\u093f\u0938\u0947\u0902\u092c\u0930"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "dd-MM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ks-arab-in.js b/src/ngLocale/angular-locale_ks-arab-in.js
index 3f971acc25e4..3f2caf1cf0c4 100644
--- a/src/ngLocale/angular-locale_ks-arab-in.js
+++ b/src/ngLocale/angular-locale_ks-arab-in.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u064f\u0645\u06c1",
       "\u0628\u0679\u0648\u0627\u0631"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0655\u0644 \u0645\u0633\u06cc\u0656\u062d",
+      "\u0639\u06cc\u0656\u0633\u0648\u06cc \u0633\u0646\u06c1\u0655"
+    ],
+    "ERAS": [
+      "\u0628\u06cc \u0633\u06cc",
+      "\u0627\u06d2 \u0688\u06cc"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u062c\u0646\u0624\u0631\u06cc",
       "\u0641\u0631\u0624\u0631\u06cc",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ks-arab.js b/src/ngLocale/angular-locale_ks-arab.js
index 20da873cf371..364703caeb8b 100644
--- a/src/ngLocale/angular-locale_ks-arab.js
+++ b/src/ngLocale/angular-locale_ks-arab.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u064f\u0645\u06c1",
       "\u0628\u0679\u0648\u0627\u0631"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0655\u0644 \u0645\u0633\u06cc\u0656\u062d",
+      "\u0639\u06cc\u0656\u0633\u0648\u06cc \u0633\u0646\u06c1\u0655"
+    ],
+    "ERAS": [
+      "\u0628\u06cc \u0633\u06cc",
+      "\u0627\u06d2 \u0688\u06cc"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u062c\u0646\u0624\u0631\u06cc",
       "\u0641\u0631\u0624\u0631\u06cc",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "\u20b9",
     "DECIMAL_SEP": "\u066b",
     "GROUP_SEP": "\u066c",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ks.js b/src/ngLocale/angular-locale_ks.js
index 182b4318fa82..d5d58c66f245 100644
--- a/src/ngLocale/angular-locale_ks.js
+++ b/src/ngLocale/angular-locale_ks.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u064f\u0645\u06c1",
       "\u0628\u0679\u0648\u0627\u0631"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0655\u0644 \u0645\u0633\u06cc\u0656\u062d",
+      "\u0639\u06cc\u0656\u0633\u0648\u06cc \u0633\u0646\u06c1\u0655"
+    ],
+    "ERAS": [
+      "\u0628\u06cc \u0633\u06cc",
+      "\u0627\u06d2 \u0688\u06cc"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u062c\u0646\u0624\u0631\u06cc",
       "\u0641\u0631\u0624\u0631\u06cc",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ksb-tz.js b/src/ngLocale/angular-locale_ksb-tz.js
index ff88b0c049c6..f52a6f36252d 100644
--- a/src/ngLocale/angular-locale_ksb-tz.js
+++ b/src/ngLocale/angular-locale_ksb-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumaamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Klisto",
+      "Baada ya Klisto"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januali",
       "Febluali",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_ksb.js b/src/ngLocale/angular-locale_ksb.js
index 760077f02f2a..145289260197 100644
--- a/src/ngLocale/angular-locale_ksb.js
+++ b/src/ngLocale/angular-locale_ksb.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumaamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Klisto",
+      "Baada ya Klisto"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januali",
       "Febluali",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_ksf-cm.js b/src/ngLocale/angular-locale_ksf-cm.js
index d492ec00d376..a3f69547b074 100644
--- a/src/ngLocale/angular-locale_ksf-cm.js
+++ b/src/ngLocale/angular-locale_ksf-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "j\u00famb\u00e1",
       "samd\u00ed"
     ],
+    "ERANAMES": [
+      "di Y\u025b\u0301sus ak\u00e1 y\u00e1l\u025b",
+      "c\u00e1m\u025b\u025bn k\u01dd k\u01ddb\u0254pka Y"
+    ],
+    "ERAS": [
+      "d.Y.",
+      "k.Y."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u014bw\u00ed\u00ed a nt\u0254\u0301nt\u0254",
       "\u014bw\u00ed\u00ed ak\u01dd b\u025b\u0301\u025b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u014b11",
       "\u014b12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ksf.js b/src/ngLocale/angular-locale_ksf.js
index c8220bc57f14..dfd65a2e4457 100644
--- a/src/ngLocale/angular-locale_ksf.js
+++ b/src/ngLocale/angular-locale_ksf.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "j\u00famb\u00e1",
       "samd\u00ed"
     ],
+    "ERANAMES": [
+      "di Y\u025b\u0301sus ak\u00e1 y\u00e1l\u025b",
+      "c\u00e1m\u025b\u025bn k\u01dd k\u01ddb\u0254pka Y"
+    ],
+    "ERAS": [
+      "d.Y.",
+      "k.Y."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u014bw\u00ed\u00ed a nt\u0254\u0301nt\u0254",
       "\u014bw\u00ed\u00ed ak\u01dd b\u025b\u0301\u025b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u014b11",
       "\u014b12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ksh-de.js b/src/ngLocale/angular-locale_ksh-de.js
index 2ca27f8e9ace..c69f40d7430a 100644
--- a/src/ngLocale/angular-locale_ksh-de.js
+++ b/src/ngLocale/angular-locale_ksh-de.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friidaach",
       "Samsdaach"
     ],
+    "ERANAMES": [
+      "v\u00fcr Chrestus",
+      "noh Chrestus"
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Jannewa",
       "F\u00e4browa",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, 'd\u00e4' d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM. y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ksh.js b/src/ngLocale/angular-locale_ksh.js
index 56e21f15ee05..cb166982d715 100644
--- a/src/ngLocale/angular-locale_ksh.js
+++ b/src/ngLocale/angular-locale_ksh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Friidaach",
       "Samsdaach"
     ],
+    "ERANAMES": [
+      "v\u00fcr Chrestus",
+      "noh Chrestus"
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Jannewa",
       "F\u00e4browa",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, 'd\u00e4' d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM. y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_kw-gb.js b/src/ngLocale/angular-locale_kw-gb.js
index 679bf83e78ee..45be15071378 100644
--- a/src/ngLocale/angular-locale_kw-gb.js
+++ b/src/ngLocale/angular-locale_kw-gb.js
@@ -26,27 +26,36 @@ $provide.value("$locale", {
       "p.m."
     ],
     "DAY": [
-      "De Sul",
-      "De Lun",
-      "De Merth",
-      "De Merher",
-      "De Yow",
-      "De Gwener",
-      "De Sadorn"
+      "dy Sul",
+      "dy Lun",
+      "dy Meurth",
+      "dy Merher",
+      "dy Yow",
+      "dy Gwener",
+      "dy Sadorn"
     ],
+    "ERANAMES": [
+      "RC",
+      "AD"
+    ],
+    "ERAS": [
+      "RC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
-      "Mys Genver",
-      "Mys Whevrel",
-      "Mys Merth",
-      "Mys Ebrel",
-      "Mys Me",
-      "Mys Efan",
-      "Mys Gortheren",
-      "Mye Est",
-      "Mys Gwyngala",
-      "Mys Hedra",
-      "Mys Du",
-      "Mys Kevardhu"
+      "mis Genver",
+      "mis Hwevrer",
+      "mis Meurth",
+      "mis Ebrel",
+      "mis Me",
+      "mis Metheven",
+      "mis Gortheren",
+      "mis Est",
+      "mis Gwynngala",
+      "mis Hedra",
+      "mis Du",
+      "mis Kevardhu"
     ],
     "SHORTDAY": [
       "Sul",
@@ -59,11 +68,11 @@ $provide.value("$locale", {
     ],
     "SHORTMONTH": [
       "Gen",
-      "Whe",
-      "Mer",
+      "Hwe",
+      "Meu",
       "Ebr",
       "Me",
-      "Efn",
+      "Met",
       "Gor",
       "Est",
       "Gwn",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Du",
       "Kev"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_kw.js b/src/ngLocale/angular-locale_kw.js
index 920eb2e7411a..b1349d6a4234 100644
--- a/src/ngLocale/angular-locale_kw.js
+++ b/src/ngLocale/angular-locale_kw.js
@@ -26,27 +26,36 @@ $provide.value("$locale", {
       "p.m."
     ],
     "DAY": [
-      "De Sul",
-      "De Lun",
-      "De Merth",
-      "De Merher",
-      "De Yow",
-      "De Gwener",
-      "De Sadorn"
+      "dy Sul",
+      "dy Lun",
+      "dy Meurth",
+      "dy Merher",
+      "dy Yow",
+      "dy Gwener",
+      "dy Sadorn"
     ],
+    "ERANAMES": [
+      "RC",
+      "AD"
+    ],
+    "ERAS": [
+      "RC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
-      "Mys Genver",
-      "Mys Whevrel",
-      "Mys Merth",
-      "Mys Ebrel",
-      "Mys Me",
-      "Mys Efan",
-      "Mys Gortheren",
-      "Mye Est",
-      "Mys Gwyngala",
-      "Mys Hedra",
-      "Mys Du",
-      "Mys Kevardhu"
+      "mis Genver",
+      "mis Hwevrer",
+      "mis Meurth",
+      "mis Ebrel",
+      "mis Me",
+      "mis Metheven",
+      "mis Gortheren",
+      "mis Est",
+      "mis Gwynngala",
+      "mis Hedra",
+      "mis Du",
+      "mis Kevardhu"
     ],
     "SHORTDAY": [
       "Sul",
@@ -59,11 +68,11 @@ $provide.value("$locale", {
     ],
     "SHORTMONTH": [
       "Gen",
-      "Whe",
-      "Mer",
+      "Hwe",
+      "Meu",
       "Ebr",
       "Me",
-      "Efn",
+      "Met",
       "Gor",
       "Est",
       "Gwn",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Du",
       "Kev"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ky-cyrl-kg.js b/src/ngLocale/angular-locale_ky-cyrl-kg.js
index fcfc01492632..75a594719d95 100644
--- a/src/ngLocale/angular-locale_ky-cyrl-kg.js
+++ b/src/ngLocale/angular-locale_ky-cyrl-kg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0436\u0443\u043c\u0430",
       "\u0438\u0448\u0435\u043c\u0431\u0438"
     ],
+    "ERANAMES": [
+      "\u0431\u0438\u0437\u0434\u0438\u043d \u0437\u0430\u043c\u0430\u043d\u0433\u0430 \u0447\u0435\u0439\u0438\u043d",
+      "\u0431\u0438\u0437\u0434\u0438\u043d \u0437\u0430\u043c\u0430\u043d"
+    ],
+    "ERAS": [
+      "\u0431.\u0437.\u0447.",
+      "\u0431.\u0437."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044c",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044c",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d-MMMM, y-'\u0436'.",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ky-cyrl.js b/src/ngLocale/angular-locale_ky-cyrl.js
index dd41ca363857..7c5a577843de 100644
--- a/src/ngLocale/angular-locale_ky-cyrl.js
+++ b/src/ngLocale/angular-locale_ky-cyrl.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0436\u0443\u043c\u0430",
       "\u0438\u0448\u0435\u043c\u0431\u0438"
     ],
+    "ERANAMES": [
+      "\u0431\u0438\u0437\u0434\u0438\u043d \u0437\u0430\u043c\u0430\u043d\u0433\u0430 \u0447\u0435\u0439\u0438\u043d",
+      "\u0431\u0438\u0437\u0434\u0438\u043d \u0437\u0430\u043c\u0430\u043d"
+    ],
+    "ERAS": [
+      "\u0431.\u0437.\u0447.",
+      "\u0431.\u0437."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044c",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044c",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d-MMMM, y-'\u0436'.",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "KGS",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": "\u00a0",
     "PATTERNS": [
diff --git a/src/ngLocale/angular-locale_ky.js b/src/ngLocale/angular-locale_ky.js
index 9db5b3c51378..b7fe26351d5a 100644
--- a/src/ngLocale/angular-locale_ky.js
+++ b/src/ngLocale/angular-locale_ky.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0436\u0443\u043c\u0430",
       "\u0438\u0448\u0435\u043c\u0431\u0438"
     ],
+    "ERANAMES": [
+      "\u0431\u0438\u0437\u0434\u0438\u043d \u0437\u0430\u043c\u0430\u043d\u0433\u0430 \u0447\u0435\u0439\u0438\u043d",
+      "\u0431\u0438\u0437\u0434\u0438\u043d \u0437\u0430\u043c\u0430\u043d"
+    ],
+    "ERAS": [
+      "\u0431.\u0437.\u0447.",
+      "\u0431.\u0437."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044c",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044c",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d-MMMM, y-'\u0436'.",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_lag-tz.js b/src/ngLocale/angular-locale_lag-tz.js
index 491a92cb7462..a76e7696ede0 100644
--- a/src/ngLocale/angular-locale_lag-tz.js
+++ b/src/ngLocale/angular-locale_lag-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijum\u00e1a",
       "Jumam\u00f3osi"
     ],
+    "ERANAMES": [
+      "K\u0268r\u0268sit\u0289 s\u0268 anavyaal",
+      "K\u0268r\u0268sit\u0289 akavyaalwe"
+    ],
+    "ERAS": [
+      "KSA",
+      "KA"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "K\u0289f\u00fangat\u0268",
       "K\u0289naan\u0268",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Saano",
       "Sasat\u0289"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_lag.js b/src/ngLocale/angular-locale_lag.js
index ad1ddd2d90b4..6fb2f6e53c51 100644
--- a/src/ngLocale/angular-locale_lag.js
+++ b/src/ngLocale/angular-locale_lag.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijum\u00e1a",
       "Jumam\u00f3osi"
     ],
+    "ERANAMES": [
+      "K\u0268r\u0268sit\u0289 s\u0268 anavyaal",
+      "K\u0268r\u0268sit\u0289 akavyaalwe"
+    ],
+    "ERAS": [
+      "KSA",
+      "KA"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "K\u0289f\u00fangat\u0268",
       "K\u0289naan\u0268",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Saano",
       "Sasat\u0289"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_lb-lu.js b/src/ngLocale/angular-locale_lb-lu.js
index 4acd71d3bf03..64ef9776921a 100644
--- a/src/ngLocale/angular-locale_lb-lu.js
+++ b/src/ngLocale/angular-locale_lb-lu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freideg",
       "Samschdeg"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_lb.js b/src/ngLocale/angular-locale_lb.js
index 71fec48d090d..dd721993738a 100644
--- a/src/ngLocale/angular-locale_lb.js
+++ b/src/ngLocale/angular-locale_lb.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Freideg",
       "Samschdeg"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar",
       "Februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov.",
       "Dez."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_lg-ug.js b/src/ngLocale/angular-locale_lg-ug.js
index 23b9e14866e3..78d1c9f0be6f 100644
--- a/src/ngLocale/angular-locale_lg-ug.js
+++ b/src/ngLocale/angular-locale_lg-ug.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Lwakutaano",
       "Lwamukaaga"
     ],
+    "ERANAMES": [
+      "Kulisito nga tannaza",
+      "Bukya Kulisito Azaal"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janwaliyo",
       "Febwaliyo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_lg.js b/src/ngLocale/angular-locale_lg.js
index 72aa7bb072fa..e0bbf02f1fe9 100644
--- a/src/ngLocale/angular-locale_lg.js
+++ b/src/ngLocale/angular-locale_lg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Lwakutaano",
       "Lwamukaaga"
     ],
+    "ERANAMES": [
+      "Kulisito nga tannaza",
+      "Bukya Kulisito Azaal"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janwaliyo",
       "Febwaliyo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_lkt-us.js b/src/ngLocale/angular-locale_lkt-us.js
index 8e76bf51ffb7..e5b488b86ca4 100644
--- a/src/ngLocale/angular-locale_lkt-us.js
+++ b/src/ngLocale/angular-locale_lkt-us.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "A\u014bp\u00e9tuzapta\u014b",
       "Ow\u00e1\u014bgyu\u017ea\u017eapi"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Wi\u00f3the\u021fika W\u00ed",
       "Thiy\u00f3\u021feyu\u014bka W\u00ed",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Wan\u00edyetu W\u00ed",
       "T\u021fah\u00e9kap\u0161u\u014b W\u00ed"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_lkt.js b/src/ngLocale/angular-locale_lkt.js
index 20c72ea83bbb..57398cb3e1b3 100644
--- a/src/ngLocale/angular-locale_lkt.js
+++ b/src/ngLocale/angular-locale_lkt.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "A\u014bp\u00e9tuzapta\u014b",
       "Ow\u00e1\u014bgyu\u017ea\u017eapi"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Wi\u00f3the\u021fika W\u00ed",
       "Thiy\u00f3\u021feyu\u014bka W\u00ed",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Wan\u00edyetu W\u00ed",
       "T\u021fah\u00e9kap\u0161u\u014b W\u00ed"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ln-ao.js b/src/ngLocale/angular-locale_ln-ao.js
index 695b8ff43caa..8a88e889ae03 100644
--- a/src/ngLocale/angular-locale_ln-ao.js
+++ b/src/ngLocale/angular-locale_ln-ao.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "mok\u0254l\u0254 ya m\u00edt\u00e1no",
       "mp\u0254\u0301s\u0254"
     ],
+    "ERANAMES": [
+      "Yambo ya Y\u00e9zu Kr\u00eds",
+      "Nsima ya Y\u00e9zu Kr\u00eds"
+    ],
+    "ERAS": [
+      "lib\u00f3so ya",
+      "nsima ya Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "s\u00e1nz\u00e1 ya yambo",
       "s\u00e1nz\u00e1 ya m\u00edbal\u00e9",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nvb",
       "dsb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ln-cd.js b/src/ngLocale/angular-locale_ln-cd.js
index 3255b62793c1..f08e4f4f6643 100644
--- a/src/ngLocale/angular-locale_ln-cd.js
+++ b/src/ngLocale/angular-locale_ln-cd.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "mok\u0254l\u0254 ya m\u00edt\u00e1no",
       "mp\u0254\u0301s\u0254"
     ],
+    "ERANAMES": [
+      "Yambo ya Y\u00e9zu Kr\u00eds",
+      "Nsima ya Y\u00e9zu Kr\u00eds"
+    ],
+    "ERAS": [
+      "lib\u00f3so ya",
+      "nsima ya Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "s\u00e1nz\u00e1 ya yambo",
       "s\u00e1nz\u00e1 ya m\u00edbal\u00e9",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nvb",
       "dsb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ln-cf.js b/src/ngLocale/angular-locale_ln-cf.js
index 32a2260a70e4..7af86d5a9272 100644
--- a/src/ngLocale/angular-locale_ln-cf.js
+++ b/src/ngLocale/angular-locale_ln-cf.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "mok\u0254l\u0254 ya m\u00edt\u00e1no",
       "mp\u0254\u0301s\u0254"
     ],
+    "ERANAMES": [
+      "Yambo ya Y\u00e9zu Kr\u00eds",
+      "Nsima ya Y\u00e9zu Kr\u00eds"
+    ],
+    "ERAS": [
+      "lib\u00f3so ya",
+      "nsima ya Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "s\u00e1nz\u00e1 ya yambo",
       "s\u00e1nz\u00e1 ya m\u00edbal\u00e9",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nvb",
       "dsb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ln-cg.js b/src/ngLocale/angular-locale_ln-cg.js
index 59a07675ba7a..5c8e41cd5ada 100644
--- a/src/ngLocale/angular-locale_ln-cg.js
+++ b/src/ngLocale/angular-locale_ln-cg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "mok\u0254l\u0254 ya m\u00edt\u00e1no",
       "mp\u0254\u0301s\u0254"
     ],
+    "ERANAMES": [
+      "Yambo ya Y\u00e9zu Kr\u00eds",
+      "Nsima ya Y\u00e9zu Kr\u00eds"
+    ],
+    "ERAS": [
+      "lib\u00f3so ya",
+      "nsima ya Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "s\u00e1nz\u00e1 ya yambo",
       "s\u00e1nz\u00e1 ya m\u00edbal\u00e9",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nvb",
       "dsb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ln.js b/src/ngLocale/angular-locale_ln.js
index e5def461bbbc..300de98e8522 100644
--- a/src/ngLocale/angular-locale_ln.js
+++ b/src/ngLocale/angular-locale_ln.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "mok\u0254l\u0254 ya m\u00edt\u00e1no",
       "mp\u0254\u0301s\u0254"
     ],
+    "ERANAMES": [
+      "Yambo ya Y\u00e9zu Kr\u00eds",
+      "Nsima ya Y\u00e9zu Kr\u00eds"
+    ],
+    "ERAS": [
+      "lib\u00f3so ya",
+      "nsima ya Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "s\u00e1nz\u00e1 ya yambo",
       "s\u00e1nz\u00e1 ya m\u00edbal\u00e9",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nvb",
       "dsb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_lo-la.js b/src/ngLocale/angular-locale_lo-la.js
index 798cbad675ef..f6bf34f10749 100644
--- a/src/ngLocale/angular-locale_lo-la.js
+++ b/src/ngLocale/angular-locale_lo-la.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0ea7\u0eb1\u0e99\u0eaa\u0eb8\u0e81",
       "\u0ea7\u0eb1\u0e99\u0ec0\u0eaa\u0ebb\u0eb2"
     ],
+    "ERANAMES": [
+      "\u0e81\u0ec8\u0ead\u0e99\u0e84\u0ea3\u0eb4\u0e94\u0eaa\u0eb1\u0e81\u0e81\u0eb0\u0ea5\u0eb2\u0e94",
+      "\u0e84\u0ea3\u0eb4\u0e94\u0eaa\u0eb1\u0e81\u0e81\u0eb0\u0ea5\u0eb2\u0e94"
+    ],
+    "ERAS": [
+      "\u0e81\u0ec8\u0ead\u0e99 \u0e84.\u0eaa.",
+      "\u0e84.\u0eaa."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0ea1\u0eb1\u0e87\u0e81\u0ead\u0e99",
       "\u0e81\u0eb8\u0ea1\u0e9e\u0eb2",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0e9e.\u0e88.",
       "\u0e97.\u0ea7."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE \u0e97\u0eb5 d MMMM G y",
     "longDate": "d MMMM y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_lo.js b/src/ngLocale/angular-locale_lo.js
index 23297aab4718..76d517543fd8 100644
--- a/src/ngLocale/angular-locale_lo.js
+++ b/src/ngLocale/angular-locale_lo.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0ea7\u0eb1\u0e99\u0eaa\u0eb8\u0e81",
       "\u0ea7\u0eb1\u0e99\u0ec0\u0eaa\u0ebb\u0eb2"
     ],
+    "ERANAMES": [
+      "\u0e81\u0ec8\u0ead\u0e99\u0e84\u0ea3\u0eb4\u0e94\u0eaa\u0eb1\u0e81\u0e81\u0eb0\u0ea5\u0eb2\u0e94",
+      "\u0e84\u0ea3\u0eb4\u0e94\u0eaa\u0eb1\u0e81\u0e81\u0eb0\u0ea5\u0eb2\u0e94"
+    ],
+    "ERAS": [
+      "\u0e81\u0ec8\u0ead\u0e99 \u0e84.\u0eaa.",
+      "\u0e84.\u0eaa."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0ea1\u0eb1\u0e87\u0e81\u0ead\u0e99",
       "\u0e81\u0eb8\u0ea1\u0e9e\u0eb2",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0e9e.\u0e88.",
       "\u0e97.\u0ea7."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE \u0e97\u0eb5 d MMMM G y",
     "longDate": "d MMMM y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_lt-lt.js b/src/ngLocale/angular-locale_lt-lt.js
index e19343b2dafb..34e16f9d6594 100644
--- a/src/ngLocale/angular-locale_lt-lt.js
+++ b/src/ngLocale/angular-locale_lt-lt.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "penktadienis",
       "\u0161e\u0161tadienis"
     ],
+    "ERANAMES": [
+      "prie\u0161 Krist\u0173",
+      "po Kristaus"
+    ],
+    "ERAS": [
+      "pr. Kr.",
+      "po Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "sausio",
       "vasario",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "lapkr.",
       "gruod."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y 'm'. MMMM d 'd'., EEEE",
     "longDate": "y 'm'. MMMM d 'd'.",
     "medium": "y-MM-dd HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_lt.js b/src/ngLocale/angular-locale_lt.js
index aea8cdd2ea68..b8f7a9b3df5f 100644
--- a/src/ngLocale/angular-locale_lt.js
+++ b/src/ngLocale/angular-locale_lt.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "penktadienis",
       "\u0161e\u0161tadienis"
     ],
+    "ERANAMES": [
+      "prie\u0161 Krist\u0173",
+      "po Kristaus"
+    ],
+    "ERAS": [
+      "pr. Kr.",
+      "po Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "sausio",
       "vasario",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "lapkr.",
       "gruod."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y 'm'. MMMM d 'd'., EEEE",
     "longDate": "y 'm'. MMMM d 'd'.",
     "medium": "y-MM-dd HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_lu-cd.js b/src/ngLocale/angular-locale_lu-cd.js
index a40430a8bb40..055332330b53 100644
--- a/src/ngLocale/angular-locale_lu-cd.js
+++ b/src/ngLocale/angular-locale_lu-cd.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ng\u00f2vya",
       "Lubingu"
     ],
+    "ERANAMES": [
+      "Kumpala kwa Yezu Kli",
+      "Kunyima kwa Yezu Kli"
+    ],
+    "ERAS": [
+      "kmp. Y.K.",
+      "kny. Y. K."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ciongo",
       "L\u00f9ishi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Kas",
       "Cis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_lu.js b/src/ngLocale/angular-locale_lu.js
index 883bb4a0f9bb..9cddb8fab549 100644
--- a/src/ngLocale/angular-locale_lu.js
+++ b/src/ngLocale/angular-locale_lu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ng\u00f2vya",
       "Lubingu"
     ],
+    "ERANAMES": [
+      "Kumpala kwa Yezu Kli",
+      "Kunyima kwa Yezu Kli"
+    ],
+    "ERAS": [
+      "kmp. Y.K.",
+      "kny. Y. K."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ciongo",
       "L\u00f9ishi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Kas",
       "Cis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_luo-ke.js b/src/ngLocale/angular-locale_luo-ke.js
index f9087dc82d86..0f85ee6be2f8 100644
--- a/src/ngLocale/angular-locale_luo-ke.js
+++ b/src/ngLocale/angular-locale_luo-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Tich Abich",
       "Ngeso"
     ],
+    "ERANAMES": [
+      "Kapok Kristo obiro",
+      "Ka Kristo osebiro"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Dwe mar Achiel",
       "Dwe mar Ariyo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "DGI",
       "DAG"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_luo.js b/src/ngLocale/angular-locale_luo.js
index 11e51ea2d8f4..0067d1f42f45 100644
--- a/src/ngLocale/angular-locale_luo.js
+++ b/src/ngLocale/angular-locale_luo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Tich Abich",
       "Ngeso"
     ],
+    "ERANAMES": [
+      "Kapok Kristo obiro",
+      "Ka Kristo osebiro"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Dwe mar Achiel",
       "Dwe mar Ariyo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "DGI",
       "DAG"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_luy-ke.js b/src/ngLocale/angular-locale_luy-ke.js
index 585be34c1df4..301f5bf83775 100644
--- a/src/ngLocale/angular-locale_luy-ke.js
+++ b/src/ngLocale/angular-locale_luy-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Murwa wa Katano",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Imberi ya Kuuza Kwa",
+      "Muhiga Kuvita Kuuza"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_luy.js b/src/ngLocale/angular-locale_luy.js
index efb968da372a..01f683a53d71 100644
--- a/src/ngLocale/angular-locale_luy.js
+++ b/src/ngLocale/angular-locale_luy.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Murwa wa Katano",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Imberi ya Kuuza Kwa",
+      "Muhiga Kuvita Kuuza"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_lv-lv.js b/src/ngLocale/angular-locale_lv-lv.js
index 343b8b9aa2c3..e892fd4373dc 100644
--- a/src/ngLocale/angular-locale_lv-lv.js
+++ b/src/ngLocale/angular-locale_lv-lv.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "piektdiena",
       "sestdiena"
     ],
+    "ERANAMES": [
+      "pirms m\u016bsu \u0113ras",
+      "m\u016bsu \u0113r\u0101"
+    ],
+    "ERAS": [
+      "p.m.\u0113.",
+      "m.\u0113."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janv\u0101ris",
       "febru\u0101ris",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y. 'gada' d. MMMM",
     "longDate": "y. 'gada' d. MMMM",
     "medium": "y. 'gada' d. MMM HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_lv.js b/src/ngLocale/angular-locale_lv.js
index 8cdceb63d264..c22256cbbae3 100644
--- a/src/ngLocale/angular-locale_lv.js
+++ b/src/ngLocale/angular-locale_lv.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "piektdiena",
       "sestdiena"
     ],
+    "ERANAMES": [
+      "pirms m\u016bsu \u0113ras",
+      "m\u016bsu \u0113r\u0101"
+    ],
+    "ERAS": [
+      "p.m.\u0113.",
+      "m.\u0113."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janv\u0101ris",
       "febru\u0101ris",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y. 'gada' d. MMMM",
     "longDate": "y. 'gada' d. MMMM",
     "medium": "y. 'gada' d. MMM HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mas-ke.js b/src/ngLocale/angular-locale_mas-ke.js
index bb9f48e09626..74bf268bde6b 100644
--- a/src/ngLocale/angular-locale_mas-ke.js
+++ b/src/ngLocale/angular-locale_mas-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jum\u00e1a",
       "Jumam\u00f3si"
     ],
+    "ERANAMES": [
+      "Me\u00edn\u014d Y\u025b\u0301s\u0289",
+      "E\u00edn\u014d Y\u025b\u0301s\u0289"
+    ],
+    "ERAS": [
+      "MY",
+      "EY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Oladal\u0289\u0301",
       "Ar\u00e1t",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Sh\u0289\u0301",
       "Nt\u0289\u0301"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mas-tz.js b/src/ngLocale/angular-locale_mas-tz.js
index 0c193198aa7e..0a81920be8d4 100644
--- a/src/ngLocale/angular-locale_mas-tz.js
+++ b/src/ngLocale/angular-locale_mas-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jum\u00e1a",
       "Jumam\u00f3si"
     ],
+    "ERANAMES": [
+      "Me\u00edn\u014d Y\u025b\u0301s\u0289",
+      "E\u00edn\u014d Y\u025b\u0301s\u0289"
+    ],
+    "ERAS": [
+      "MY",
+      "EY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Oladal\u0289\u0301",
       "Ar\u00e1t",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Sh\u0289\u0301",
       "Nt\u0289\u0301"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mas.js b/src/ngLocale/angular-locale_mas.js
index d2807efdef87..16938f98df4d 100644
--- a/src/ngLocale/angular-locale_mas.js
+++ b/src/ngLocale/angular-locale_mas.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jum\u00e1a",
       "Jumam\u00f3si"
     ],
+    "ERANAMES": [
+      "Me\u00edn\u014d Y\u025b\u0301s\u0289",
+      "E\u00edn\u014d Y\u025b\u0301s\u0289"
+    ],
+    "ERAS": [
+      "MY",
+      "EY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Oladal\u0289\u0301",
       "Ar\u00e1t",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Sh\u0289\u0301",
       "Nt\u0289\u0301"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mer-ke.js b/src/ngLocale/angular-locale_mer-ke.js
index 0c5297b232dd..da3e57d0d5a0 100644
--- a/src/ngLocale/angular-locale_mer-ke.js
+++ b/src/ngLocale/angular-locale_mer-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Wetano",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Mbere ya Krist\u0169",
+      "Nyuma ya Krist\u0169"
+    ],
+    "ERAS": [
+      "MK",
+      "NK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar\u0129",
       "Feburuar\u0129",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "NOV",
       "DEC"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mer.js b/src/ngLocale/angular-locale_mer.js
index c9a87ea715f7..8c359f30edba 100644
--- a/src/ngLocale/angular-locale_mer.js
+++ b/src/ngLocale/angular-locale_mer.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Wetano",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Mbere ya Krist\u0169",
+      "Nyuma ya Krist\u0169"
+    ],
+    "ERAS": [
+      "MK",
+      "NK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januar\u0129",
       "Feburuar\u0129",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "NOV",
       "DEC"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mfe-mu.js b/src/ngLocale/angular-locale_mfe-mu.js
index fe7f61638d77..1222582ea749 100644
--- a/src/ngLocale/angular-locale_mfe-mu.js
+++ b/src/ngLocale/angular-locale_mfe-mu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vandredi",
       "samdi"
     ],
+    "ERANAMES": [
+      "avan Zezi-Krist",
+      "apre Zezi-Krist"
+    ],
+    "ERAS": [
+      "av. Z-K",
+      "ap. Z-K"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "zanvie",
       "fevriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mfe.js b/src/ngLocale/angular-locale_mfe.js
index ec2af98ec73f..56029318d6cb 100644
--- a/src/ngLocale/angular-locale_mfe.js
+++ b/src/ngLocale/angular-locale_mfe.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vandredi",
       "samdi"
     ],
+    "ERANAMES": [
+      "avan Zezi-Krist",
+      "apre Zezi-Krist"
+    ],
+    "ERAS": [
+      "av. Z-K",
+      "ap. Z-K"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "zanvie",
       "fevriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mg-mg.js b/src/ngLocale/angular-locale_mg-mg.js
index 8d4e7c90e878..7d6499176341 100644
--- a/src/ngLocale/angular-locale_mg-mg.js
+++ b/src/ngLocale/angular-locale_mg-mg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Zoma",
       "Asabotsy"
     ],
+    "ERANAMES": [
+      "Alohan\u2019i JK",
+      "Aorian\u2019i JK"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janoary",
       "Febroary",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mg.js b/src/ngLocale/angular-locale_mg.js
index e26b97352c0c..7b4b871689b9 100644
--- a/src/ngLocale/angular-locale_mg.js
+++ b/src/ngLocale/angular-locale_mg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Zoma",
       "Asabotsy"
     ],
+    "ERANAMES": [
+      "Alohan\u2019i JK",
+      "Aorian\u2019i JK"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janoary",
       "Febroary",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mgh-mz.js b/src/ngLocale/angular-locale_mgh-mz.js
index 41860482bd60..3a96657c7e30 100644
--- a/src/ngLocale/angular-locale_mgh-mz.js
+++ b/src/ngLocale/angular-locale_mgh-mz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Hinapiya yesu",
+      "Yopia yesu"
+    ],
+    "ERAS": [
+      "HY",
+      "YY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mweri wo kwanza",
       "Mweri wo unayeli",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Moj",
       "Yel"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mgh.js b/src/ngLocale/angular-locale_mgh.js
index ee4fedcff890..8b52d09442ec 100644
--- a/src/ngLocale/angular-locale_mgh.js
+++ b/src/ngLocale/angular-locale_mgh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Hinapiya yesu",
+      "Yopia yesu"
+    ],
+    "ERAS": [
+      "HY",
+      "YY"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mweri wo kwanza",
       "Mweri wo unayeli",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Moj",
       "Yel"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mgo-cm.js b/src/ngLocale/angular-locale_mgo-cm.js
index 75a17a77ec40..da0baa9d2173 100644
--- a/src/ngLocale/angular-locale_mgo-cm.js
+++ b/src/ngLocale/angular-locale_mgo-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Aneg 6",
       "Aneg 7"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "im\u0259g mbegtug",
       "imeg \u00e0b\u00f9b\u00ec",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "im\u0259g z\u00f2",
       "im\u0259g krizmed"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mgo.js b/src/ngLocale/angular-locale_mgo.js
index e8bbf23c26ad..74bc53ecad0d 100644
--- a/src/ngLocale/angular-locale_mgo.js
+++ b/src/ngLocale/angular-locale_mgo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Aneg 6",
       "Aneg 7"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "im\u0259g mbegtug",
       "imeg \u00e0b\u00f9b\u00ec",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "im\u0259g z\u00f2",
       "im\u0259g krizmed"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mk-mk.js b/src/ngLocale/angular-locale_mk-mk.js
index e7a3d04b4039..bd775d868684 100644
--- a/src/ngLocale/angular-locale_mk-mk.js
+++ b/src/ngLocale/angular-locale_mk-mk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u043e\u043a",
       "\u0441\u0430\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u043f\u0440\u0435\u0434 \u043d\u0430\u0448\u0430\u0442\u0430 \u0435\u0440\u0430",
+      "\u043e\u0434 \u043d\u0430\u0448\u0430\u0442\u0430 \u0435\u0440\u0430"
+    ],
+    "ERAS": [
+      "\u043f\u0440.\u043d.\u0435.",
+      "\u043d.\u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440\u0438",
       "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0435\u043c.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "dd.M.y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mk.js b/src/ngLocale/angular-locale_mk.js
index 94618a5da285..b456dc6efebd 100644
--- a/src/ngLocale/angular-locale_mk.js
+++ b/src/ngLocale/angular-locale_mk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u043e\u043a",
       "\u0441\u0430\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u043f\u0440\u0435\u0434 \u043d\u0430\u0448\u0430\u0442\u0430 \u0435\u0440\u0430",
+      "\u043e\u0434 \u043d\u0430\u0448\u0430\u0442\u0430 \u0435\u0440\u0430"
+    ],
+    "ERAS": [
+      "\u043f\u0440.\u043d.\u0435.",
+      "\u043d.\u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440\u0438",
       "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0435\u043c.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "dd MMMM y",
     "medium": "dd.M.y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ml-in.js b/src/ngLocale/angular-locale_ml-in.js
index 64ec7282927b..c3d012ff7a1a 100644
--- a/src/ngLocale/angular-locale_ml-in.js
+++ b/src/ngLocale/angular-locale_ml-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0d35\u0d46\u0d33\u0d4d\u0d33\u0d3f\u0d2f\u0d3e\u0d34\u0d4d\u200c\u0d1a",
       "\u0d36\u0d28\u0d3f\u0d2f\u0d3e\u0d34\u0d4d\u200c\u0d1a"
     ],
+    "ERANAMES": [
+      "\u0d15\u0d4d\u0d30\u0d3f\u0d38\u0d4d\u200c\u0d24\u0d41\u0d35\u0d3f\u0d28\u0d4d \u0d2e\u0d41\u0d2e\u0d4d\u0d2a\u0d4d",
+      "\u0d06\u0d28\u0d4d\u0d28\u0d4b \u0d21\u0d4a\u0d2e\u0d3f\u0d28\u0d3f"
+    ],
+    "ERAS": [
+      "\u0d15\u0d4d\u0d30\u0d3f.\u0d2e\u0d41.",
+      "\u0d0e\u0d21\u0d3f"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0d1c\u0d28\u0d41\u0d35\u0d30\u0d3f",
       "\u0d2b\u0d46\u0d2c\u0d4d\u0d30\u0d41\u0d35\u0d30\u0d3f",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0d28\u0d35\u0d02",
       "\u0d21\u0d3f\u0d38\u0d02"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "y, MMMM d, EEEE",
     "longDate": "y, MMMM d",
     "medium": "y, MMM d h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ml.js b/src/ngLocale/angular-locale_ml.js
index 7a880ce16057..8d50656ed960 100644
--- a/src/ngLocale/angular-locale_ml.js
+++ b/src/ngLocale/angular-locale_ml.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0d35\u0d46\u0d33\u0d4d\u0d33\u0d3f\u0d2f\u0d3e\u0d34\u0d4d\u200c\u0d1a",
       "\u0d36\u0d28\u0d3f\u0d2f\u0d3e\u0d34\u0d4d\u200c\u0d1a"
     ],
+    "ERANAMES": [
+      "\u0d15\u0d4d\u0d30\u0d3f\u0d38\u0d4d\u200c\u0d24\u0d41\u0d35\u0d3f\u0d28\u0d4d \u0d2e\u0d41\u0d2e\u0d4d\u0d2a\u0d4d",
+      "\u0d06\u0d28\u0d4d\u0d28\u0d4b \u0d21\u0d4a\u0d2e\u0d3f\u0d28\u0d3f"
+    ],
+    "ERAS": [
+      "\u0d15\u0d4d\u0d30\u0d3f.\u0d2e\u0d41.",
+      "\u0d0e\u0d21\u0d3f"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0d1c\u0d28\u0d41\u0d35\u0d30\u0d3f",
       "\u0d2b\u0d46\u0d2c\u0d4d\u0d30\u0d41\u0d35\u0d30\u0d3f",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0d28\u0d35\u0d02",
       "\u0d21\u0d3f\u0d38\u0d02"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "y, MMMM d, EEEE",
     "longDate": "y, MMMM d",
     "medium": "y, MMM d h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mn-cyrl-mn.js b/src/ngLocale/angular-locale_mn-cyrl-mn.js
index 0d91c7eb32c7..961fdd2c6d53 100644
--- a/src/ngLocale/angular-locale_mn-cyrl-mn.js
+++ b/src/ngLocale/angular-locale_mn-cyrl-mn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0431\u0430\u0430\u0441\u0430\u043d",
       "\u0431\u044f\u043c\u0431\u0430"
     ],
+    "ERANAMES": [
+      "\u043c\u0430\u043d\u0430\u0439 \u044d\u0440\u0438\u043d\u0438\u0439 \u04e9\u043c\u043d\u04e9\u0445",
+      "\u043c\u0430\u043d\u0430\u0439 \u044d\u0440\u0438\u043d\u0438\u0439"
+    ],
+    "ERAS": [
+      "\u041c\u042d\u04e8",
+      "\u041c\u042d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u041d\u044d\u0433\u0434\u04af\u0433\u044d\u044d\u0440 \u0441\u0430\u0440",
       "\u0425\u043e\u0451\u0440\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11-\u0440 \u0441\u0430\u0440",
       "12-\u0440 \u0441\u0430\u0440"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y '\u043e\u043d\u044b' MM '\u0441\u0430\u0440\u044b\u043d' d",
     "longDate": "y '\u043e\u043d\u044b' MM '\u0441\u0430\u0440\u044b\u043d' d",
     "medium": "y MMM d HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mn-cyrl.js b/src/ngLocale/angular-locale_mn-cyrl.js
index 7b9fe6fbe077..c69a40d3823b 100644
--- a/src/ngLocale/angular-locale_mn-cyrl.js
+++ b/src/ngLocale/angular-locale_mn-cyrl.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0431\u0430\u0430\u0441\u0430\u043d",
       "\u0431\u044f\u043c\u0431\u0430"
     ],
+    "ERANAMES": [
+      "\u043c\u0430\u043d\u0430\u0439 \u044d\u0440\u0438\u043d\u0438\u0439 \u04e9\u043c\u043d\u04e9\u0445",
+      "\u043c\u0430\u043d\u0430\u0439 \u044d\u0440\u0438\u043d\u0438\u0439"
+    ],
+    "ERAS": [
+      "\u041c\u042d\u04e8",
+      "\u041c\u042d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u041d\u044d\u0433\u0434\u04af\u0433\u044d\u044d\u0440 \u0441\u0430\u0440",
       "\u0425\u043e\u0451\u0440\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11-\u0440 \u0441\u0430\u0440",
       "12-\u0440 \u0441\u0430\u0440"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y '\u043e\u043d\u044b' MM '\u0441\u0430\u0440\u044b\u043d' d",
     "longDate": "y '\u043e\u043d\u044b' MM '\u0441\u0430\u0440\u044b\u043d' d",
     "medium": "y MMM d HH:mm:ss",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "\u20ae",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mn.js b/src/ngLocale/angular-locale_mn.js
index 7c284c200b73..0b4240931be3 100644
--- a/src/ngLocale/angular-locale_mn.js
+++ b/src/ngLocale/angular-locale_mn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0431\u0430\u0430\u0441\u0430\u043d",
       "\u0431\u044f\u043c\u0431\u0430"
     ],
+    "ERANAMES": [
+      "\u043c\u0430\u043d\u0430\u0439 \u044d\u0440\u0438\u043d\u0438\u0439 \u04e9\u043c\u043d\u04e9\u0445",
+      "\u043c\u0430\u043d\u0430\u0439 \u044d\u0440\u0438\u043d\u0438\u0439"
+    ],
+    "ERAS": [
+      "\u041c\u042d\u04e8",
+      "\u041c\u042d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u041d\u044d\u0433\u0434\u04af\u0433\u044d\u044d\u0440 \u0441\u0430\u0440",
       "\u0425\u043e\u0451\u0440\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11-\u0440 \u0441\u0430\u0440",
       "12-\u0440 \u0441\u0430\u0440"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y '\u043e\u043d\u044b' MM '\u0441\u0430\u0440\u044b\u043d' d",
     "longDate": "y '\u043e\u043d\u044b' MM '\u0441\u0430\u0440\u044b\u043d' d",
     "medium": "y MMM d HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mr-in.js b/src/ngLocale/angular-locale_mr-in.js
index fc60810023cd..b040d89d5218 100644
--- a/src/ngLocale/angular-locale_mr-in.js
+++ b/src/ngLocale/angular-locale_mr-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930",
       "\u0936\u0928\u093f\u0935\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u0935\u0940\u0938\u0928\u092a\u0942\u0930\u094d\u0935",
+      "\u0908\u0938\u0935\u0940\u0938\u0928"
+    ],
+    "ERAS": [
+      "\u0907. \u0938. \u092a\u0942.",
+      "\u0907. \u0938."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940",
       "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0928\u094b\u0935\u094d\u0939\u0947\u0902",
       "\u0921\u093f\u0938\u0947\u0902"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mr.js b/src/ngLocale/angular-locale_mr.js
index bf4412038809..5f5847dfdf94 100644
--- a/src/ngLocale/angular-locale_mr.js
+++ b/src/ngLocale/angular-locale_mr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930",
       "\u0936\u0928\u093f\u0935\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u0935\u0940\u0938\u0928\u092a\u0942\u0930\u094d\u0935",
+      "\u0908\u0938\u0935\u0940\u0938\u0928"
+    ],
+    "ERAS": [
+      "\u0907. \u0938. \u092a\u0942.",
+      "\u0907. \u0938."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940",
       "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0928\u094b\u0935\u094d\u0939\u0947\u0902",
       "\u0921\u093f\u0938\u0947\u0902"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ms-latn-bn.js b/src/ngLocale/angular-locale_ms-latn-bn.js
index 27183b0bea24..1bc9d07ce225 100644
--- a/src/ngLocale/angular-locale_ms-latn-bn.js
+++ b/src/ngLocale/angular-locale_ms-latn-bn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Jumaat",
       "Sabtu"
     ],
+    "ERANAMES": [
+      "S.M.",
+      "TM"
+    ],
+    "ERAS": [
+      "S.M.",
+      "TM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ms-latn-my.js b/src/ngLocale/angular-locale_ms-latn-my.js
index bc91e5908bed..5177e15f4221 100644
--- a/src/ngLocale/angular-locale_ms-latn-my.js
+++ b/src/ngLocale/angular-locale_ms-latn-my.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Jumaat",
       "Sabtu"
     ],
+    "ERANAMES": [
+      "S.M.",
+      "TM"
+    ],
+    "ERAS": [
+      "S.M.",
+      "TM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ms-latn-sg.js b/src/ngLocale/angular-locale_ms-latn-sg.js
index 62b5bd5196cb..ebd3bd4cbbc1 100644
--- a/src/ngLocale/angular-locale_ms-latn-sg.js
+++ b/src/ngLocale/angular-locale_ms-latn-sg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Jumaat",
       "Sabtu"
     ],
+    "ERANAMES": [
+      "S.M.",
+      "TM"
+    ],
+    "ERAS": [
+      "S.M.",
+      "TM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ms-latn.js b/src/ngLocale/angular-locale_ms-latn.js
index 37084f805d57..2d4c07a84282 100644
--- a/src/ngLocale/angular-locale_ms-latn.js
+++ b/src/ngLocale/angular-locale_ms-latn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Jumaat",
       "Sabtu"
     ],
+    "ERANAMES": [
+      "S.M.",
+      "TM"
+    ],
+    "ERAS": [
+      "S.M.",
+      "TM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "RM",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ms.js b/src/ngLocale/angular-locale_ms.js
index d07588163901..0549f85b0e4f 100644
--- a/src/ngLocale/angular-locale_ms.js
+++ b/src/ngLocale/angular-locale_ms.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Jumaat",
       "Sabtu"
     ],
+    "ERANAMES": [
+      "S.M.",
+      "TM"
+    ],
+    "ERAS": [
+      "S.M.",
+      "TM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mt-mt.js b/src/ngLocale/angular-locale_mt-mt.js
index b0b41c9b6036..20170a1a0a41 100644
--- a/src/ngLocale/angular-locale_mt-mt.js
+++ b/src/ngLocale/angular-locale_mt-mt.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Il-\u0120img\u0127a",
       "Is-Sibt"
     ],
+    "ERANAMES": [
+      "Qabel Kristu",
+      "Wara Kristu"
+    ],
+    "ERAS": [
+      "QK",
+      "WK"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Jannar",
       "Frar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Di\u010b"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'ta'\u2019 MMMM y",
     "longDate": "d 'ta'\u2019 MMMM y",
     "medium": "dd MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mt.js b/src/ngLocale/angular-locale_mt.js
index 2d0b1c4e19ee..94902b1952f0 100644
--- a/src/ngLocale/angular-locale_mt.js
+++ b/src/ngLocale/angular-locale_mt.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Il-\u0120img\u0127a",
       "Is-Sibt"
     ],
+    "ERANAMES": [
+      "Qabel Kristu",
+      "Wara Kristu"
+    ],
+    "ERAS": [
+      "QK",
+      "WK"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Jannar",
       "Frar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Di\u010b"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'ta'\u2019 MMMM y",
     "longDate": "d 'ta'\u2019 MMMM y",
     "medium": "dd MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mua-cm.js b/src/ngLocale/angular-locale_mua-cm.js
index 9496099ee996..49c1012de479 100644
--- a/src/ngLocale/angular-locale_mua-cm.js
+++ b/src/ngLocale/angular-locale_mua-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Comgaisuu",
       "Comzye\u0253suu"
     ],
+    "ERANAMES": [
+      "K\u01ddPel Kristu",
+      "Pel Kristu"
+    ],
+    "ERAS": [
+      "KK",
+      "PK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "F\u0129i Loo",
       "Cokcwakla\u014bne",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "FGW",
       "FYU"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_mua.js b/src/ngLocale/angular-locale_mua.js
index 4f0e180fd846..c5f30a2f850b 100644
--- a/src/ngLocale/angular-locale_mua.js
+++ b/src/ngLocale/angular-locale_mua.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Comgaisuu",
       "Comzye\u0253suu"
     ],
+    "ERANAMES": [
+      "K\u01ddPel Kristu",
+      "Pel Kristu"
+    ],
+    "ERAS": [
+      "KK",
+      "PK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "F\u0129i Loo",
       "Cokcwakla\u014bne",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "FGW",
       "FYU"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_my-mm.js b/src/ngLocale/angular-locale_my-mm.js
index cf3691c3b420..d658ac96cd73 100644
--- a/src/ngLocale/angular-locale_my-mm.js
+++ b/src/ngLocale/angular-locale_my-mm.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u101e\u1031\u102c\u1000\u103c\u102c",
       "\u1005\u1014\u1031"
     ],
+    "ERANAMES": [
+      "\u1001\u101b\u1005\u103a\u1010\u1031\u102c\u103a \u1019\u1015\u1031\u102b\u103a\u1019\u102e\u1000\u102c\u101c",
+      "\u1001\u101b\u1005\u103a\u1010\u1031\u102c\u103a \u1015\u1031\u102b\u103a\u1011\u103d\u1014\u103a\u1038\u1015\u103c\u102e\u1038\u1000\u102c\u101c"
+    ],
+    "ERAS": [
+      "\u1018\u102e\u1005\u102e",
+      "\u1021\u1031\u1012\u102e"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u1007\u1014\u103a\u1014\u101d\u102b\u101b\u102e",
       "\u1016\u1031\u1016\u1031\u102c\u103a\u101d\u102b\u101b\u102e",
@@ -53,7 +62,11 @@ $provide.value("$locale", {
       "\u1014\u102d\u102f",
       "\u1012\u102e"
     ],
-    "fullDate": "EEEE, dd MMMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE\u104a dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
     "mediumDate": "d MMM y",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_my.js b/src/ngLocale/angular-locale_my.js
index 01c098fd6a35..7a6c02b472d7 100644
--- a/src/ngLocale/angular-locale_my.js
+++ b/src/ngLocale/angular-locale_my.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u101e\u1031\u102c\u1000\u103c\u102c",
       "\u1005\u1014\u1031"
     ],
+    "ERANAMES": [
+      "\u1001\u101b\u1005\u103a\u1010\u1031\u102c\u103a \u1019\u1015\u1031\u102b\u103a\u1019\u102e\u1000\u102c\u101c",
+      "\u1001\u101b\u1005\u103a\u1010\u1031\u102c\u103a \u1015\u1031\u102b\u103a\u1011\u103d\u1014\u103a\u1038\u1015\u103c\u102e\u1038\u1000\u102c\u101c"
+    ],
+    "ERAS": [
+      "\u1018\u102e\u1005\u102e",
+      "\u1021\u1031\u1012\u102e"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u1007\u1014\u103a\u1014\u101d\u102b\u101b\u102e",
       "\u1016\u1031\u1016\u1031\u102c\u103a\u101d\u102b\u101b\u102e",
@@ -53,7 +62,11 @@ $provide.value("$locale", {
       "\u1014\u102d\u102f",
       "\u1012\u102e"
     ],
-    "fullDate": "EEEE, dd MMMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE\u104a dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
     "mediumDate": "d MMM y",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_naq-na.js b/src/ngLocale/angular-locale_naq-na.js
index 5281f9b254f3..699ab6211b3f 100644
--- a/src/ngLocale/angular-locale_naq-na.js
+++ b/src/ngLocale/angular-locale_naq-na.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Fraitaxtsees",
       "Satertaxtsees"
     ],
+    "ERANAMES": [
+      "Xristub ai\u01c3\u00e2",
+      "Xristub khao\u01c3g\u00e2"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u01c3Khanni",
       "\u01c3Khan\u01c0g\u00f4ab",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_naq.js b/src/ngLocale/angular-locale_naq.js
index 52bc467cd945..3c376cdb7de2 100644
--- a/src/ngLocale/angular-locale_naq.js
+++ b/src/ngLocale/angular-locale_naq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Fraitaxtsees",
       "Satertaxtsees"
     ],
+    "ERANAMES": [
+      "Xristub ai\u01c3\u00e2",
+      "Xristub khao\u01c3g\u00e2"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u01c3Khanni",
       "\u01c3Khan\u01c0g\u00f4ab",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nb-no.js b/src/ngLocale/angular-locale_nb-no.js
index 227cc20824d7..931bf639e739 100644
--- a/src/ngLocale/angular-locale_nb-no.js
+++ b/src/ngLocale/angular-locale_nb-no.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f8rdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH.mm.ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nb-sj.js b/src/ngLocale/angular-locale_nb-sj.js
index 3626313eb6d6..487815bf0f98 100644
--- a/src/ngLocale/angular-locale_nb-sj.js
+++ b/src/ngLocale/angular-locale_nb-sj.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f8rdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH.mm.ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nb.js b/src/ngLocale/angular-locale_nb.js
index fc54f15820dc..61106d82e15d 100644
--- a/src/ngLocale/angular-locale_nb.js
+++ b/src/ngLocale/angular-locale_nb.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f8rdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH.mm.ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nd-zw.js b/src/ngLocale/angular-locale_nd-zw.js
index 881b00ac294f..b9ac58142e15 100644
--- a/src/ngLocale/angular-locale_nd-zw.js
+++ b/src/ngLocale/angular-locale_nd-zw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Sihlanu",
       "Mgqibelo"
     ],
+    "ERANAMES": [
+      "UKristo angakabuyi",
+      "Ukristo ebuyile"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Zibandlela",
       "Nhlolanja",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Lwe",
       "Mpal"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nd.js b/src/ngLocale/angular-locale_nd.js
index 136666e2ff4c..96d113bd1664 100644
--- a/src/ngLocale/angular-locale_nd.js
+++ b/src/ngLocale/angular-locale_nd.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Sihlanu",
       "Mgqibelo"
     ],
+    "ERANAMES": [
+      "UKristo angakabuyi",
+      "Ukristo ebuyile"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Zibandlela",
       "Nhlolanja",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Lwe",
       "Mpal"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ne-in.js b/src/ngLocale/angular-locale_ne-in.js
index 7aac84ed02a6..283c8ca2adf8 100644
--- a/src/ngLocale/angular-locale_ne-in.js
+++ b/src/ngLocale/angular-locale_ne-in.js
@@ -8,27 +8,36 @@ $provide.value("$locale", {
       "\u0905\u092a\u0930\u093e\u0939\u094d\u0928"
     ],
     "DAY": [
-      "\u0906\u0907\u0924\u0935\u093e\u0930",
-      "\u0938\u094b\u092e\u0935\u093e\u0930",
-      "\u092e\u0919\u094d\u0917\u0932\u0935\u093e\u0930",
-      "\u092c\u0941\u0927\u0935\u093e\u0930",
-      "\u092c\u093f\u0939\u0940\u0935\u093e\u0930",
-      "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930",
-      "\u0936\u0928\u093f\u0935\u093e\u0930"
+      "\u0906\u0907\u0924\u092c\u093e\u0930",
+      "\u0938\u094b\u092e\u092c\u093e\u0930",
+      "\u092e\u0919\u094d\u0917\u0932\u092c\u093e\u0930",
+      "\u092c\u0941\u0927\u092c\u093e\u0930",
+      "\u092c\u093f\u0939\u093f\u092c\u093e\u0930",
+      "\u0936\u0941\u0915\u094d\u0930\u092c\u093e\u0930",
+      "\u0936\u0928\u093f\u092c\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u093e \u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928\u094d"
+    ],
+    "ERAS": [
+      "\u0908\u0938\u093e \u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928\u094d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u0928\u0935\u0930\u0940",
-      "\u092b\u0930\u0935\u0930\u0940",
+      "\u092b\u0947\u092c\u094d\u0930\u0941\u0905\u0930\u0940",
       "\u092e\u093e\u0930\u094d\u091a",
-      "\u0905\u092a\u094d\u0930\u0947\u0932",
+      "\u0905\u092a\u094d\u0930\u093f\u0932",
       "\u092e\u0908",
       "\u091c\u0941\u0928",
       "\u091c\u0941\u0932\u093e\u0908",
-      "\u0905\u0917\u0938\u094d\u0924",
+      "\u0905\u0917\u0938\u094d\u091f",
       "\u0938\u0947\u092a\u094d\u091f\u0947\u092e\u094d\u092c\u0930",
       "\u0905\u0915\u094d\u091f\u094b\u092c\u0930",
       "\u0928\u094b\u092d\u0947\u092e\u094d\u092c\u0930",
-      "\u0926\u093f\u0938\u092e\u094d\u092c\u0930"
+      "\u0921\u093f\u0938\u0947\u092e\u094d\u092c\u0930"
     ],
     "SHORTDAY": [
       "\u0906\u0907\u0924",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0928\u094b\u092d\u0947\u092e\u094d\u092c\u0930",
       "\u0921\u093f\u0938\u0947\u092e\u094d\u092c\u0930"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ne-np.js b/src/ngLocale/angular-locale_ne-np.js
index ad00bc496b5e..d8e52d088ab4 100644
--- a/src/ngLocale/angular-locale_ne-np.js
+++ b/src/ngLocale/angular-locale_ne-np.js
@@ -4,24 +4,33 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "\u092a\u0942\u0930\u094d\u0935 \u092e\u0927\u094d\u092f\u093e\u0928\u094d\u0939",
-      "\u0909\u0924\u094d\u0924\u0930 \u092e\u0927\u094d\u092f\u093e\u0928\u094d\u0939"
+      "\u092a\u0942\u0930\u094d\u0935\u093e\u0939\u094d\u0928",
+      "\u0905\u092a\u0930\u093e\u0939\u094d\u0928"
     ],
     "DAY": [
       "\u0906\u0907\u0924\u092c\u093e\u0930",
       "\u0938\u094b\u092e\u092c\u093e\u0930",
       "\u092e\u0919\u094d\u0917\u0932\u092c\u093e\u0930",
       "\u092c\u0941\u0927\u092c\u093e\u0930",
-      "\u092c\u093f\u0939\u0940\u092c\u093e\u0930",
+      "\u092c\u093f\u0939\u093f\u092c\u093e\u0930",
       "\u0936\u0941\u0915\u094d\u0930\u092c\u093e\u0930",
       "\u0936\u0928\u093f\u092c\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u093e \u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928\u094d"
+    ],
+    "ERAS": [
+      "\u0908\u0938\u093e \u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928\u094d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u0928\u0935\u0930\u0940",
       "\u092b\u0947\u092c\u094d\u0930\u0941\u0905\u0930\u0940",
       "\u092e\u093e\u0930\u094d\u091a",
       "\u0905\u092a\u094d\u0930\u093f\u0932",
-      "\u092e\u0947",
+      "\u092e\u0908",
       "\u091c\u0941\u0928",
       "\u091c\u0941\u0932\u093e\u0908",
       "\u0905\u0917\u0938\u094d\u091f",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0928\u094b\u092d\u0947\u092e\u094d\u092c\u0930",
       "\u0921\u093f\u0938\u0947\u092e\u094d\u092c\u0930"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ne.js b/src/ngLocale/angular-locale_ne.js
index d278adae2aa8..cff99fec1bf4 100644
--- a/src/ngLocale/angular-locale_ne.js
+++ b/src/ngLocale/angular-locale_ne.js
@@ -4,24 +4,33 @@ var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "
 $provide.value("$locale", {
   "DATETIME_FORMATS": {
     "AMPMS": [
-      "\u092a\u0942\u0930\u094d\u0935 \u092e\u0927\u094d\u092f\u093e\u0928\u094d\u0939",
-      "\u0909\u0924\u094d\u0924\u0930 \u092e\u0927\u094d\u092f\u093e\u0928\u094d\u0939"
+      "\u092a\u0942\u0930\u094d\u0935\u093e\u0939\u094d\u0928",
+      "\u0905\u092a\u0930\u093e\u0939\u094d\u0928"
     ],
     "DAY": [
       "\u0906\u0907\u0924\u092c\u093e\u0930",
       "\u0938\u094b\u092e\u092c\u093e\u0930",
       "\u092e\u0919\u094d\u0917\u0932\u092c\u093e\u0930",
       "\u092c\u0941\u0927\u092c\u093e\u0930",
-      "\u092c\u093f\u0939\u0940\u092c\u093e\u0930",
+      "\u092c\u093f\u0939\u093f\u092c\u093e\u0930",
       "\u0936\u0941\u0915\u094d\u0930\u092c\u093e\u0930",
       "\u0936\u0928\u093f\u092c\u093e\u0930"
     ],
+    "ERANAMES": [
+      "\u0908\u0938\u093e \u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928\u094d"
+    ],
+    "ERAS": [
+      "\u0908\u0938\u093e \u092a\u0942\u0930\u094d\u0935",
+      "\u0938\u0928\u094d"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u091c\u0928\u0935\u0930\u0940",
       "\u092b\u0947\u092c\u094d\u0930\u0941\u0905\u0930\u0940",
       "\u092e\u093e\u0930\u094d\u091a",
       "\u0905\u092a\u094d\u0930\u093f\u0932",
-      "\u092e\u0947",
+      "\u092e\u0908",
       "\u091c\u0941\u0928",
       "\u091c\u0941\u0932\u093e\u0908",
       "\u0905\u0917\u0938\u094d\u091f",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0928\u094b\u092d\u0947\u092e\u094d\u092c\u0930",
       "\u0921\u093f\u0938\u0947\u092e\u094d\u092c\u0930"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nl-aw.js b/src/ngLocale/angular-locale_nl-aw.js
index 52ae309f7d5f..3e22477d4e31 100644
--- a/src/ngLocale/angular-locale_nl-aw.js
+++ b/src/ngLocale/angular-locale_nl-aw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vrijdag",
       "zaterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.Chr.",
+      "n.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,8 +115,8 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0",
-        "negSuf": "-",
+        "negPre": "\u00a4\u00a0-",
+        "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
diff --git a/src/ngLocale/angular-locale_nl-be.js b/src/ngLocale/angular-locale_nl-be.js
index bd8a569f72a3..38ba3ab8425e 100644
--- a/src/ngLocale/angular-locale_nl-be.js
+++ b/src/ngLocale/angular-locale_nl-be.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vrijdag",
       "zaterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.Chr.",
+      "n.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,10 +80,14 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d-MMM-y HH:mm:ss",
-    "mediumDate": "d-MMM-y",
+    "medium": "d MMM y HH:mm:ss",
+    "mediumDate": "d MMM y",
     "mediumTime": "HH:mm:ss",
     "short": "d/MM/yy HH:mm",
     "shortDate": "d/MM/yy",
diff --git a/src/ngLocale/angular-locale_nl-bq.js b/src/ngLocale/angular-locale_nl-bq.js
index 5bf5d8517831..87c008a23afd 100644
--- a/src/ngLocale/angular-locale_nl-bq.js
+++ b/src/ngLocale/angular-locale_nl-bq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vrijdag",
       "zaterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.Chr.",
+      "n.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,8 +115,8 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0",
-        "negSuf": "-",
+        "negPre": "\u00a4\u00a0-",
+        "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
diff --git a/src/ngLocale/angular-locale_nl-cw.js b/src/ngLocale/angular-locale_nl-cw.js
index ec766ee69a0f..7475f6ed9bb0 100644
--- a/src/ngLocale/angular-locale_nl-cw.js
+++ b/src/ngLocale/angular-locale_nl-cw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vrijdag",
       "zaterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.Chr.",
+      "n.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "ANG",
+    "CURRENCY_SYM": "NAf.",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": ".",
     "PATTERNS": [
@@ -102,8 +115,8 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0",
-        "negSuf": "-",
+        "negPre": "\u00a4\u00a0-",
+        "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
diff --git a/src/ngLocale/angular-locale_nl-nl.js b/src/ngLocale/angular-locale_nl-nl.js
index 9a4a52138a45..3b7bd150e686 100644
--- a/src/ngLocale/angular-locale_nl-nl.js
+++ b/src/ngLocale/angular-locale_nl-nl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vrijdag",
       "zaterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.Chr.",
+      "n.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,8 +115,8 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0",
-        "negSuf": "-",
+        "negPre": "\u00a4\u00a0-",
+        "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
diff --git a/src/ngLocale/angular-locale_nl-sr.js b/src/ngLocale/angular-locale_nl-sr.js
index 0586aca7d79e..06875a8158a7 100644
--- a/src/ngLocale/angular-locale_nl-sr.js
+++ b/src/ngLocale/angular-locale_nl-sr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vrijdag",
       "zaterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.Chr.",
+      "n.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,8 +115,8 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0",
-        "negSuf": "-",
+        "negPre": "\u00a4\u00a0-",
+        "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
diff --git a/src/ngLocale/angular-locale_nl-sx.js b/src/ngLocale/angular-locale_nl-sx.js
index aa2b37e8badd..c59dfb5accaa 100644
--- a/src/ngLocale/angular-locale_nl-sx.js
+++ b/src/ngLocale/angular-locale_nl-sx.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vrijdag",
       "zaterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.Chr.",
+      "n.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "ANG",
+    "CURRENCY_SYM": "NAf.",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": ".",
     "PATTERNS": [
@@ -102,8 +115,8 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0",
-        "negSuf": "-",
+        "negPre": "\u00a4\u00a0-",
+        "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
diff --git a/src/ngLocale/angular-locale_nl.js b/src/ngLocale/angular-locale_nl.js
index bee9598d21a8..79428d98be28 100644
--- a/src/ngLocale/angular-locale_nl.js
+++ b/src/ngLocale/angular-locale_nl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vrijdag",
       "zaterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.Chr.",
+      "n.Chr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
@@ -102,8 +115,8 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0",
-        "negSuf": "-",
+        "negPre": "\u00a4\u00a0-",
+        "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
       }
diff --git a/src/ngLocale/angular-locale_nmg-cm.js b/src/ngLocale/angular-locale_nmg-cm.js
index b03ae13b0e09..24594190e8da 100644
--- a/src/ngLocale/angular-locale_nmg-cm.js
+++ b/src/ngLocale/angular-locale_nmg-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mab\u00e1g\u00e1 m\u00e1 sukul",
       "s\u00e1sadi"
     ],
+    "ERANAMES": [
+      "B\u00f3 Lahl\u025b\u0304",
+      "Pfi\u025b Bur\u012b"
+    ],
+    "ERAS": [
+      "BL",
+      "PB"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ngw\u025bn mat\u00e1hra",
       "ngw\u025bn \u0144mba",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ng11",
       "kris"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_nmg.js b/src/ngLocale/angular-locale_nmg.js
index 313900839fc4..98f5073e6f78 100644
--- a/src/ngLocale/angular-locale_nmg.js
+++ b/src/ngLocale/angular-locale_nmg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mab\u00e1g\u00e1 m\u00e1 sukul",
       "s\u00e1sadi"
     ],
+    "ERANAMES": [
+      "B\u00f3 Lahl\u025b\u0304",
+      "Pfi\u025b Bur\u012b"
+    ],
+    "ERAS": [
+      "BL",
+      "PB"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ngw\u025bn mat\u00e1hra",
       "ngw\u025bn \u0144mba",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ng11",
       "kris"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_nn-no.js b/src/ngLocale/angular-locale_nn-no.js
index cb16b29276fc..c303718bb475 100644
--- a/src/ngLocale/angular-locale_nn-no.js
+++ b/src/ngLocale/angular-locale_nn-no.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fredag",
       "laurdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_nn.js b/src/ngLocale/angular-locale_nn.js
index 5d25b37c8be2..6d2f0370c59a 100644
--- a/src/ngLocale/angular-locale_nn.js
+++ b/src/ngLocale/angular-locale_nn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fredag",
       "laurdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_nnh-cm.js b/src/ngLocale/angular-locale_nnh-cm.js
index 4a5d8902f7f1..92eef3bf8058 100644
--- a/src/ngLocale/angular-locale_nnh-cm.js
+++ b/src/ngLocale/angular-locale_nnh-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mvf\u00f2 m\u00e0ga ly\u025b\u030c\u02bc",
       "m\u00e0ga ly\u025b\u030c\u02bc"
     ],
+    "ERANAMES": [
+      "m\u00e9 zy\u00e9 Y\u011bs\u00f4",
+      "m\u00e9 g\u00ffo \u0144zy\u00e9 Y\u011bs\u00f4"
+    ],
+    "ERAS": [
+      "m.z.Y.",
+      "m.g.n.Y."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "sa\u014b tsets\u025b\u0300\u025b l\u00f9m",
       "sa\u014b k\u00e0g ngw\u00f3\u014b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "sa\u014b mejwo\u014b\u00f3",
       "sa\u014b l\u00f9m"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE , 'ly\u025b'\u030c\u02bc d 'na' MMMM, y",
     "longDate": "'ly\u025b'\u030c\u02bc d 'na' MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nnh.js b/src/ngLocale/angular-locale_nnh.js
index df2775ecae49..b8745d193346 100644
--- a/src/ngLocale/angular-locale_nnh.js
+++ b/src/ngLocale/angular-locale_nnh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "mvf\u00f2 m\u00e0ga ly\u025b\u030c\u02bc",
       "m\u00e0ga ly\u025b\u030c\u02bc"
     ],
+    "ERANAMES": [
+      "m\u00e9 zy\u00e9 Y\u011bs\u00f4",
+      "m\u00e9 g\u00ffo \u0144zy\u00e9 Y\u011bs\u00f4"
+    ],
+    "ERAS": [
+      "m.z.Y.",
+      "m.g.n.Y."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "sa\u014b tsets\u025b\u0300\u025b l\u00f9m",
       "sa\u014b k\u00e0g ngw\u00f3\u014b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "sa\u014b mejwo\u014b\u00f3",
       "sa\u014b l\u00f9m"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE , 'ly\u025b'\u030c\u02bc d 'na' MMMM, y",
     "longDate": "'ly\u025b'\u030c\u02bc d 'na' MMMM, y",
     "medium": "d MMM, y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_no-no.js b/src/ngLocale/angular-locale_no-no.js
index 94232f401a41..dc93791c96be 100644
--- a/src/ngLocale/angular-locale_no-no.js
+++ b/src/ngLocale/angular-locale_no-no.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f8rdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH.mm.ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_no.js b/src/ngLocale/angular-locale_no.js
index 222d64d4bca6..b0b2fec1c676 100644
--- a/src/ngLocale/angular-locale_no.js
+++ b/src/ngLocale/angular-locale_no.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f8rdag"
     ],
+    "ERANAMES": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov.",
       "des."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH.mm.ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nr-za.js b/src/ngLocale/angular-locale_nr-za.js
index f53b2993a930..60a2745ff3b3 100644
--- a/src/ngLocale/angular-locale_nr-za.js
+++ b/src/ngLocale/angular-locale_nr-za.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "ngoLesihlanu",
       "umGqibelo"
     ],
+    "ERANAMES": [
+      "BC",
+      "AD"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Janabari",
       "uFeberbari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Usi",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_nr.js b/src/ngLocale/angular-locale_nr.js
index 88a51943757c..daa76c0aeca4 100644
--- a/src/ngLocale/angular-locale_nr.js
+++ b/src/ngLocale/angular-locale_nr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "ngoLesihlanu",
       "umGqibelo"
     ],
+    "ERANAMES": [
+      "BC",
+      "AD"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Janabari",
       "uFeberbari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Usi",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_nso-za.js b/src/ngLocale/angular-locale_nso-za.js
index 35e4532b2a94..493ec38ee8a0 100644
--- a/src/ngLocale/angular-locale_nso-za.js
+++ b/src/ngLocale/angular-locale_nso-za.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Labohlano",
       "Mokibelo"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Janaware",
       "Feberware",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nof",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_nso.js b/src/ngLocale/angular-locale_nso.js
index d24ff6c5b28a..50d5663a4a57 100644
--- a/src/ngLocale/angular-locale_nso.js
+++ b/src/ngLocale/angular-locale_nso.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Labohlano",
       "Mokibelo"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Janaware",
       "Feberware",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nof",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_nus-sd.js b/src/ngLocale/angular-locale_nus-sd.js
index 521575028a0d..a46aee485d63 100644
--- a/src/ngLocale/angular-locale_nus-sd.js
+++ b/src/ngLocale/angular-locale_nus-sd.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Dhieec l\u00e4tni",
       "B\u00e4k\u025bl l\u00e4tni"
     ],
+    "ERANAMES": [
+      "A ka\u0331n Yecu ni dap",
+      "\u0190 ca Yecu dap"
+    ],
+    "ERAS": [
+      "AY",
+      "\u0190Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Tiop thar p\u025bt",
       "P\u025bt",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Kur",
       "Tid"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nus.js b/src/ngLocale/angular-locale_nus.js
index f85a1578d86c..8d2014984505 100644
--- a/src/ngLocale/angular-locale_nus.js
+++ b/src/ngLocale/angular-locale_nus.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Dhieec l\u00e4tni",
       "B\u00e4k\u025bl l\u00e4tni"
     ],
+    "ERANAMES": [
+      "A ka\u0331n Yecu ni dap",
+      "\u0190 ca Yecu dap"
+    ],
+    "ERAS": [
+      "AY",
+      "\u0190Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Tiop thar p\u025bt",
       "P\u025bt",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Kur",
       "Tid"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nyn-ug.js b/src/ngLocale/angular-locale_nyn-ug.js
index ab94928365c6..bc15a7dce521 100644
--- a/src/ngLocale/angular-locale_nyn-ug.js
+++ b/src/ngLocale/angular-locale_nyn-ug.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Orwakataano",
       "Orwamukaaga"
     ],
+    "ERANAMES": [
+      "Kurisito Atakaijire",
+      "Kurisito Yaijire"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Okwokubanza",
       "Okwakabiri",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KNK",
       "KNB"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_nyn.js b/src/ngLocale/angular-locale_nyn.js
index 4b103f4569a1..ecc65b9ba843 100644
--- a/src/ngLocale/angular-locale_nyn.js
+++ b/src/ngLocale/angular-locale_nyn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Orwakataano",
       "Orwamukaaga"
     ],
+    "ERANAMES": [
+      "Kurisito Atakaijire",
+      "Kurisito Yaijire"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Okwokubanza",
       "Okwakabiri",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KNK",
       "KNB"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_om-et.js b/src/ngLocale/angular-locale_om-et.js
index 8aa021762eb8..3857abd03935 100644
--- a/src/ngLocale/angular-locale_om-et.js
+++ b/src/ngLocale/angular-locale_om-et.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jimaata",
       "Sanbata"
     ],
+    "ERANAMES": [
+      "KD",
+      "KB"
+    ],
+    "ERAS": [
+      "KD",
+      "KB"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Amajjii",
       "Guraandhala",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Sad",
       "Mud"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_om-ke.js b/src/ngLocale/angular-locale_om-ke.js
index 5511faea2dfd..dba7fd1f3393 100644
--- a/src/ngLocale/angular-locale_om-ke.js
+++ b/src/ngLocale/angular-locale_om-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jimaata",
       "Sanbata"
     ],
+    "ERANAMES": [
+      "KD",
+      "KB"
+    ],
+    "ERAS": [
+      "KD",
+      "KB"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Amajjii",
       "Guraandhala",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Sad",
       "Mud"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_om.js b/src/ngLocale/angular-locale_om.js
index 70e9bd7ec64d..c41c27722e51 100644
--- a/src/ngLocale/angular-locale_om.js
+++ b/src/ngLocale/angular-locale_om.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jimaata",
       "Sanbata"
     ],
+    "ERANAMES": [
+      "KD",
+      "KB"
+    ],
+    "ERAS": [
+      "KD",
+      "KB"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Amajjii",
       "Guraandhala",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Sad",
       "Mud"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_or-in.js b/src/ngLocale/angular-locale_or-in.js
index ecfbcb43b3e7..5f1da84c5e9a 100644
--- a/src/ngLocale/angular-locale_or-in.js
+++ b/src/ngLocale/angular-locale_or-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0b36\u0b41\u0b15\u0b4d\u0b30\u0b2c\u0b3e\u0b30",
       "\u0b36\u0b28\u0b3f\u0b2c\u0b3e\u0b30"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0b1c\u0b3e\u0b28\u0b41\u0b06\u0b30\u0b40",
       "\u0b2b\u0b47\u0b2c\u0b43\u0b06\u0b30\u0b40",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0b28\u0b2d\u0b47\u0b2e\u0b4d\u0b2c\u0b30",
       "\u0b21\u0b3f\u0b38\u0b47\u0b2e\u0b4d\u0b2c\u0b30"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_or.js b/src/ngLocale/angular-locale_or.js
index b53ab02cb636..43c4fd3af647 100644
--- a/src/ngLocale/angular-locale_or.js
+++ b/src/ngLocale/angular-locale_or.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0b36\u0b41\u0b15\u0b4d\u0b30\u0b2c\u0b3e\u0b30",
       "\u0b36\u0b28\u0b3f\u0b2c\u0b3e\u0b30"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0b1c\u0b3e\u0b28\u0b41\u0b06\u0b30\u0b40",
       "\u0b2b\u0b47\u0b2c\u0b43\u0b06\u0b30\u0b40",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0b28\u0b2d\u0b47\u0b2e\u0b4d\u0b2c\u0b30",
       "\u0b21\u0b3f\u0b38\u0b47\u0b2e\u0b4d\u0b2c\u0b30"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_os-ge.js b/src/ngLocale/angular-locale_os-ge.js
index d6af8ca2cea9..3516f726b96f 100644
--- a/src/ngLocale/angular-locale_os-ge.js
+++ b/src/ngLocale/angular-locale_os-ge.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043c\u0430\u0439\u0440\u04d5\u043c\u0431\u043e\u043d",
       "\u0441\u0430\u0431\u0430\u0442"
     ],
+    "ERANAMES": [
+      "\u043d.\u0434.\u0430.",
+      "\u043d.\u0434."
+    ],
+    "ERAS": [
+      "\u043d.\u0434.\u0430.",
+      "\u043d.\u0434."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044b",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y '\u0430\u0437'",
     "longDate": "d MMMM, y '\u0430\u0437'",
     "medium": "dd MMM y '\u0430\u0437' HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_os-ru.js b/src/ngLocale/angular-locale_os-ru.js
index 7acb0bd44dcf..d740670b057a 100644
--- a/src/ngLocale/angular-locale_os-ru.js
+++ b/src/ngLocale/angular-locale_os-ru.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043c\u0430\u0439\u0440\u04d5\u043c\u0431\u043e\u043d",
       "\u0441\u0430\u0431\u0430\u0442"
     ],
+    "ERANAMES": [
+      "\u043d.\u0434.\u0430.",
+      "\u043d.\u0434."
+    ],
+    "ERAS": [
+      "\u043d.\u0434.\u0430.",
+      "\u043d.\u0434."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044b",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y '\u0430\u0437'",
     "longDate": "d MMMM, y '\u0430\u0437'",
     "medium": "dd MMM y '\u0430\u0437' HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_os.js b/src/ngLocale/angular-locale_os.js
index 191ec75585b1..a643a330faf2 100644
--- a/src/ngLocale/angular-locale_os.js
+++ b/src/ngLocale/angular-locale_os.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043c\u0430\u0439\u0440\u04d5\u043c\u0431\u043e\u043d",
       "\u0441\u0430\u0431\u0430\u0442"
     ],
+    "ERANAMES": [
+      "\u043d.\u0434.\u0430.",
+      "\u043d.\u0434."
+    ],
+    "ERAS": [
+      "\u043d.\u0434.\u0430.",
+      "\u043d.\u0434."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044b",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y '\u0430\u0437'",
     "longDate": "d MMMM, y '\u0430\u0437'",
     "medium": "dd MMM y '\u0430\u0437' HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_pa-arab-pk.js b/src/ngLocale/angular-locale_pa-arab-pk.js
index 66f1d7caf913..90f605797616 100644
--- a/src/ngLocale/angular-locale_pa-arab-pk.js
+++ b/src/ngLocale/angular-locale_pa-arab-pk.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u06c1",
       "\u06c1\u0641\u062a\u06c1"
     ],
+    "ERANAMES": [
+      "\u0627\u064a\u0633\u0627\u067e\u0648\u0631\u0648",
+      "\u0633\u06ba"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u06cc",
       "\u0641\u0631\u0648\u0631\u06cc",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_pa-arab.js b/src/ngLocale/angular-locale_pa-arab.js
index ffd6df41d337..184a60c70d12 100644
--- a/src/ngLocale/angular-locale_pa-arab.js
+++ b/src/ngLocale/angular-locale_pa-arab.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u06c1",
       "\u06c1\u0641\u062a\u06c1"
     ],
+    "ERANAMES": [
+      "\u0627\u064a\u0633\u0627\u067e\u0648\u0631\u0648",
+      "\u0633\u06ba"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u06cc",
       "\u0641\u0631\u0648\u0631\u06cc",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_pa-guru-in.js b/src/ngLocale/angular-locale_pa-guru-in.js
index 7f014b692e91..3572f992afeb 100644
--- a/src/ngLocale/angular-locale_pa-guru-in.js
+++ b/src/ngLocale/angular-locale_pa-guru-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0a38\u0a3c\u0a41\u0a71\u0a15\u0a30\u0a35\u0a3e\u0a30",
       "\u0a38\u0a3c\u0a28\u0a3f\u0a71\u0a1a\u0a30\u0a35\u0a3e\u0a30"
     ],
+    "ERANAMES": [
+      "\u0a08\u0a38\u0a35\u0a40 \u0a2a\u0a42\u0a30\u0a35",
+      "\u0a08\u0a38\u0a35\u0a40 \u0a38\u0a70\u0a28"
+    ],
+    "ERAS": [
+      "\u0a08. \u0a2a\u0a42.",
+      "\u0a38\u0a70\u0a28"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0a1c\u0a28\u0a35\u0a30\u0a40",
       "\u0a2b\u0a3c\u0a30\u0a35\u0a30\u0a40",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0a28\u0a35\u0a70",
       "\u0a26\u0a38\u0a70"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_pa-guru.js b/src/ngLocale/angular-locale_pa-guru.js
index f15ce9d87ece..18c8431ceed5 100644
--- a/src/ngLocale/angular-locale_pa-guru.js
+++ b/src/ngLocale/angular-locale_pa-guru.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0a38\u0a3c\u0a41\u0a71\u0a15\u0a30\u0a35\u0a3e\u0a30",
       "\u0a38\u0a3c\u0a28\u0a3f\u0a71\u0a1a\u0a30\u0a35\u0a3e\u0a30"
     ],
+    "ERANAMES": [
+      "\u0a08\u0a38\u0a35\u0a40 \u0a2a\u0a42\u0a30\u0a35",
+      "\u0a08\u0a38\u0a35\u0a40 \u0a38\u0a70\u0a28"
+    ],
+    "ERAS": [
+      "\u0a08. \u0a2a\u0a42.",
+      "\u0a38\u0a70\u0a28"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0a1c\u0a28\u0a35\u0a30\u0a40",
       "\u0a2b\u0a3c\u0a30\u0a35\u0a30\u0a40",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0a28\u0a35\u0a70",
       "\u0a26\u0a38\u0a70"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "\u20b9",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_pa.js b/src/ngLocale/angular-locale_pa.js
index 61963dcf4a7a..6f6dc99539b3 100644
--- a/src/ngLocale/angular-locale_pa.js
+++ b/src/ngLocale/angular-locale_pa.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0a38\u0a3c\u0a41\u0a71\u0a15\u0a30\u0a35\u0a3e\u0a30",
       "\u0a38\u0a3c\u0a28\u0a3f\u0a71\u0a1a\u0a30\u0a35\u0a3e\u0a30"
     ],
+    "ERANAMES": [
+      "\u0a08\u0a38\u0a35\u0a40 \u0a2a\u0a42\u0a30\u0a35",
+      "\u0a08\u0a38\u0a35\u0a40 \u0a38\u0a70\u0a28"
+    ],
+    "ERAS": [
+      "\u0a08. \u0a2a\u0a42.",
+      "\u0a38\u0a70\u0a28"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0a1c\u0a28\u0a35\u0a30\u0a40",
       "\u0a2b\u0a3c\u0a30\u0a35\u0a30\u0a40",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0a28\u0a35\u0a70",
       "\u0a26\u0a38\u0a70"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_pl-pl.js b/src/ngLocale/angular-locale_pl-pl.js
index 415c72bf5e18..fae20c898c71 100644
--- a/src/ngLocale/angular-locale_pl-pl.js
+++ b/src/ngLocale/angular-locale_pl-pl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "pi\u0105tek",
       "sobota"
     ],
+    "ERANAMES": [
+      "p.n.e.",
+      "n.e."
+    ],
+    "ERAS": [
+      "p.n.e.",
+      "n.e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "stycznia",
       "lutego",
@@ -71,10 +80,14 @@ $provide.value("$locale", {
       "lis",
       "gru"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
-    "mediumDate": "d MMM y",
+    "medium": "dd.MM.y HH:mm:ss",
+    "mediumDate": "dd.MM.y",
     "mediumTime": "HH:mm:ss",
     "short": "dd.MM.y HH:mm",
     "shortDate": "dd.MM.y",
diff --git a/src/ngLocale/angular-locale_pl.js b/src/ngLocale/angular-locale_pl.js
index 8a49c7a9d824..a37a284f72be 100644
--- a/src/ngLocale/angular-locale_pl.js
+++ b/src/ngLocale/angular-locale_pl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "pi\u0105tek",
       "sobota"
     ],
+    "ERANAMES": [
+      "p.n.e.",
+      "n.e."
+    ],
+    "ERAS": [
+      "p.n.e.",
+      "n.e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "stycznia",
       "lutego",
@@ -71,10 +80,14 @@ $provide.value("$locale", {
       "lis",
       "gru"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
-    "mediumDate": "d MMM y",
+    "medium": "dd.MM.y HH:mm:ss",
+    "mediumDate": "dd.MM.y",
     "mediumTime": "HH:mm:ss",
     "short": "dd.MM.y HH:mm",
     "shortDate": "dd.MM.y",
diff --git a/src/ngLocale/angular-locale_ps-af.js b/src/ngLocale/angular-locale_ps-af.js
index 3bef8a2f4736..d6d407750223 100644
--- a/src/ngLocale/angular-locale_ps-af.js
+++ b/src/ngLocale/angular-locale_ps-af.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u0647",
       "\u0634\u0646\u0628\u0647"
     ],
+    "ERANAMES": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "ERAS": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u064a",
       "\u0641\u0628\u0631\u0648\u0631\u064a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      3,
+      4
+    ],
     "fullDate": "EEEE \u062f y \u062f MMMM d",
     "longDate": "\u062f y \u062f MMMM d",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ps.js b/src/ngLocale/angular-locale_ps.js
index edbaff59c01e..4bbe51110495 100644
--- a/src/ngLocale/angular-locale_ps.js
+++ b/src/ngLocale/angular-locale_ps.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u0647",
       "\u0634\u0646\u0628\u0647"
     ],
+    "ERANAMES": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "ERAS": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u064a",
       "\u0641\u0628\u0631\u0648\u0631\u064a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      3,
+      4
+    ],
     "fullDate": "EEEE \u062f y \u062f MMMM d",
     "longDate": "\u062f y \u062f MMMM d",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt-ao.js b/src/ngLocale/angular-locale_pt-ao.js
index cf7dbe7101d0..dcc91dab62aa 100644
--- a/src/ngLocale/angular-locale_pt-ao.js
+++ b/src/ngLocale/angular-locale_pt-ao.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "depois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd/MM/y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt-br.js b/src/ngLocale/angular-locale_pt-br.js
index 1872e7a9f7f2..146aad33647a 100644
--- a/src/ngLocale/angular-locale_pt-br.js
+++ b/src/ngLocale/angular-locale_pt-br.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "Antes de Cristo",
+      "Ano do Senhor"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "d 'de' MMM 'de' y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_pt-cv.js b/src/ngLocale/angular-locale_pt-cv.js
index 45846c811e93..d9beaa1d60b9 100644
--- a/src/ngLocale/angular-locale_pt-cv.js
+++ b/src/ngLocale/angular-locale_pt-cv.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "depois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd/MM/y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt-gw.js b/src/ngLocale/angular-locale_pt-gw.js
index 8aee86621b35..801f3e72ca9d 100644
--- a/src/ngLocale/angular-locale_pt-gw.js
+++ b/src/ngLocale/angular-locale_pt-gw.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "depois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd/MM/y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt-mo.js b/src/ngLocale/angular-locale_pt-mo.js
index e5a1520f3c46..fecce7cb9315 100644
--- a/src/ngLocale/angular-locale_pt-mo.js
+++ b/src/ngLocale/angular-locale_pt-mo.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "depois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd/MM/y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt-mz.js b/src/ngLocale/angular-locale_pt-mz.js
index 524e359562c6..e7450a218675 100644
--- a/src/ngLocale/angular-locale_pt-mz.js
+++ b/src/ngLocale/angular-locale_pt-mz.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "depois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd/MM/y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt-pt.js b/src/ngLocale/angular-locale_pt-pt.js
index 2ad53e6b58ab..6718f9dc26d1 100644
--- a/src/ngLocale/angular-locale_pt-pt.js
+++ b/src/ngLocale/angular-locale_pt-pt.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "depois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd/MM/y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt-st.js b/src/ngLocale/angular-locale_pt-st.js
index d6e02715fdcc..a6ff9cd7c0b1 100644
--- a/src/ngLocale/angular-locale_pt-st.js
+++ b/src/ngLocale/angular-locale_pt-st.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "depois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd/MM/y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt-tl.js b/src/ngLocale/angular-locale_pt-tl.js
index 517773eeca80..bb36d6dc8e37 100644
--- a/src/ngLocale/angular-locale_pt-tl.js
+++ b/src/ngLocale/angular-locale_pt-tl.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "antes de Cristo",
+      "depois de Cristo"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "dd/MM/y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_pt.js b/src/ngLocale/angular-locale_pt.js
index 9fc521b88a7c..4c80611e51cd 100644
--- a/src/ngLocale/angular-locale_pt.js
+++ b/src/ngLocale/angular-locale_pt.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "sexta-feira",
       "s\u00e1bado"
     ],
+    "ERANAMES": [
+      "Antes de Cristo",
+      "Ano do Senhor"
+    ],
+    "ERAS": [
+      "a.C.",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "janeiro",
       "fevereiro",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "nov",
       "dez"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "d 'de' MMM 'de' y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_qu-bo.js b/src/ngLocale/angular-locale_qu-bo.js
index e394c4bc2a9f..cb05d91a5df5 100644
--- a/src/ngLocale/angular-locale_qu-bo.js
+++ b/src/ngLocale/angular-locale_qu-bo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Viernes",
       "S\u00e1bado"
     ],
+    "ERANAMES": [
+      "BCE",
+      "d.C."
+    ],
+    "ERAS": [
+      "BCE",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Qulla puquy",
       "Hatun puquy",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Aya",
       "Kap"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "y MMMM d",
     "medium": "y MMM d hh:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_qu-ec.js b/src/ngLocale/angular-locale_qu-ec.js
index afb3073e6511..9978c4a3c619 100644
--- a/src/ngLocale/angular-locale_qu-ec.js
+++ b/src/ngLocale/angular-locale_qu-ec.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Viernes",
       "S\u00e1bado"
     ],
+    "ERANAMES": [
+      "BCE",
+      "d.C."
+    ],
+    "ERAS": [
+      "BCE",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Qulla puquy",
       "Hatun puquy",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Aya",
       "Kap"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "y MMMM d",
     "medium": "y MMM d hh:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_qu-pe.js b/src/ngLocale/angular-locale_qu-pe.js
index c8c11d352dd8..942275b6be79 100644
--- a/src/ngLocale/angular-locale_qu-pe.js
+++ b/src/ngLocale/angular-locale_qu-pe.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Viernes",
       "S\u00e1bado"
     ],
+    "ERANAMES": [
+      "BCE",
+      "d.C."
+    ],
+    "ERAS": [
+      "BCE",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Qulla puquy",
       "Hatun puquy",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Aya",
       "Kap"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "y MMMM d",
     "medium": "y MMM d hh:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_qu.js b/src/ngLocale/angular-locale_qu.js
index 53166755e0ab..e2b56e6d5fb3 100644
--- a/src/ngLocale/angular-locale_qu.js
+++ b/src/ngLocale/angular-locale_qu.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Viernes",
       "S\u00e1bado"
     ],
+    "ERANAMES": [
+      "BCE",
+      "d.C."
+    ],
+    "ERAS": [
+      "BCE",
+      "d.C."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Qulla puquy",
       "Hatun puquy",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Aya",
       "Kap"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "y MMMM d",
     "medium": "y MMM d hh:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_rm-ch.js b/src/ngLocale/angular-locale_rm-ch.js
index 83f81ee95ed2..091c0827e2fb 100644
--- a/src/ngLocale/angular-locale_rm-ch.js
+++ b/src/ngLocale/angular-locale_rm-ch.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venderdi",
       "sonda"
     ],
+    "ERANAMES": [
+      "avant Cristus",
+      "suenter Cristus"
+    ],
+    "ERAS": [
+      "av. Cr.",
+      "s. Cr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "schaner",
       "favrer",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, 'ils' d 'da' MMMM y",
     "longDate": "d 'da' MMMM y",
     "medium": "dd-MM-y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_rm.js b/src/ngLocale/angular-locale_rm.js
index 4538429bcc5d..7bddcf97216e 100644
--- a/src/ngLocale/angular-locale_rm.js
+++ b/src/ngLocale/angular-locale_rm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "venderdi",
       "sonda"
     ],
+    "ERANAMES": [
+      "avant Cristus",
+      "suenter Cristus"
+    ],
+    "ERAS": [
+      "av. Cr.",
+      "s. Cr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "schaner",
       "favrer",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, 'ils' d 'da' MMMM y",
     "longDate": "d 'da' MMMM y",
     "medium": "dd-MM-y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_rn-bi.js b/src/ngLocale/angular-locale_rn-bi.js
index 31d822fbb9be..cd61a1d476df 100644
--- a/src/ngLocale/angular-locale_rn-bi.js
+++ b/src/ngLocale/angular-locale_rn-bi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ku wa gatanu",
       "Ku wa gatandatu"
     ],
+    "ERANAMES": [
+      "Mbere ya Yezu",
+      "Nyuma ya Yezu"
+    ],
+    "ERAS": [
+      "Mb.Y.",
+      "Ny.Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Nzero",
       "Ruhuhuma",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Ugu.",
       "Uku."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_rn.js b/src/ngLocale/angular-locale_rn.js
index 2d7ac5e908c2..0a2a5e8ec88d 100644
--- a/src/ngLocale/angular-locale_rn.js
+++ b/src/ngLocale/angular-locale_rn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ku wa gatanu",
       "Ku wa gatandatu"
     ],
+    "ERANAMES": [
+      "Mbere ya Yezu",
+      "Nyuma ya Yezu"
+    ],
+    "ERAS": [
+      "Mb.Y.",
+      "Ny.Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Nzero",
       "Ruhuhuma",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Ugu.",
       "Uku."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ro-md.js b/src/ngLocale/angular-locale_ro-md.js
index 048e198cbb06..b36304708566 100644
--- a/src/ngLocale/angular-locale_ro-md.js
+++ b/src/ngLocale/angular-locale_ro-md.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vineri",
       "s\u00e2mb\u0103t\u0103"
     ],
+    "ERANAMES": [
+      "\u00eenainte de Hristos",
+      "dup\u0103 Hristos"
+    ],
+    "ERAS": [
+      "\u00ee.Hr.",
+      "d.Hr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ianuarie",
       "februarie",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ro-ro.js b/src/ngLocale/angular-locale_ro-ro.js
index 27fe0c471ad4..d87922602678 100644
--- a/src/ngLocale/angular-locale_ro-ro.js
+++ b/src/ngLocale/angular-locale_ro-ro.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vineri",
       "s\u00e2mb\u0103t\u0103"
     ],
+    "ERANAMES": [
+      "\u00eenainte de Hristos",
+      "dup\u0103 Hristos"
+    ],
+    "ERAS": [
+      "\u00ee.Hr.",
+      "d.Hr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ianuarie",
       "februarie",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ro.js b/src/ngLocale/angular-locale_ro.js
index 8f62d1367384..3c52dd2a70d1 100644
--- a/src/ngLocale/angular-locale_ro.js
+++ b/src/ngLocale/angular-locale_ro.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "vineri",
       "s\u00e2mb\u0103t\u0103"
     ],
+    "ERANAMES": [
+      "\u00eenainte de Hristos",
+      "dup\u0103 Hristos"
+    ],
+    "ERAS": [
+      "\u00ee.Hr.",
+      "d.Hr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ianuarie",
       "februarie",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_rof-tz.js b/src/ngLocale/angular-locale_rof-tz.js
index b2d5c1ce1d83..8458d5ca910a 100644
--- a/src/ngLocale/angular-locale_rof-tz.js
+++ b/src/ngLocale/angular-locale_rof-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Ijumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Mayesu",
+      "Baada ya Mayesu"
+    ],
+    "ERAS": [
+      "KM",
+      "BM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mweri wa kwanza",
       "Mweri wa kaili",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "M11",
       "M12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_rof.js b/src/ngLocale/angular-locale_rof.js
index 21114d5e218c..a233d6cad528 100644
--- a/src/ngLocale/angular-locale_rof.js
+++ b/src/ngLocale/angular-locale_rof.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Ijumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Mayesu",
+      "Baada ya Mayesu"
+    ],
+    "ERAS": [
+      "KM",
+      "BM"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mweri wa kwanza",
       "Mweri wa kaili",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "M11",
       "M12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ru-by.js b/src/ngLocale/angular-locale_ru-by.js
index 084060faa41e..f735266cf0e2 100644
--- a/src/ngLocale/angular-locale_ru-by.js
+++ b/src/ngLocale/angular-locale_ru-by.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
       "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044f",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044f",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f\u0431.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
     "longDate": "d MMMM y '\u0433'.",
     "medium": "d MMM y '\u0433'. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ru-kg.js b/src/ngLocale/angular-locale_ru-kg.js
index 6441207bd9d7..b1d9db982035 100644
--- a/src/ngLocale/angular-locale_ru-kg.js
+++ b/src/ngLocale/angular-locale_ru-kg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
       "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044f",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044f",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f\u0431.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
     "longDate": "d MMMM y '\u0433'.",
     "medium": "d MMM y '\u0433'. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ru-kz.js b/src/ngLocale/angular-locale_ru-kz.js
index 19ed99559a35..a1c93672969d 100644
--- a/src/ngLocale/angular-locale_ru-kz.js
+++ b/src/ngLocale/angular-locale_ru-kz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
       "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044f",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044f",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f\u0431.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
     "longDate": "d MMMM y '\u0433'.",
     "medium": "d MMM y '\u0433'. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ru-md.js b/src/ngLocale/angular-locale_ru-md.js
index f41bd58189d8..de3f0498624d 100644
--- a/src/ngLocale/angular-locale_ru-md.js
+++ b/src/ngLocale/angular-locale_ru-md.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
       "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044f",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044f",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f\u0431.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
     "longDate": "d MMMM y '\u0433'.",
     "medium": "d MMM y '\u0433'. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ru-ru.js b/src/ngLocale/angular-locale_ru-ru.js
index c45df71d4700..e9337210de25 100644
--- a/src/ngLocale/angular-locale_ru-ru.js
+++ b/src/ngLocale/angular-locale_ru-ru.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
       "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044f",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044f",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f\u0431.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
     "longDate": "d MMMM y '\u0433'.",
     "medium": "d MMM y '\u0433'. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_ru-ua.js b/src/ngLocale/angular-locale_ru-ua.js
index 3fcff891d7e2..f6dfc507eac3 100644
--- a/src/ngLocale/angular-locale_ru-ua.js
+++ b/src/ngLocale/angular-locale_ru-ua.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
       "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044f",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044f",
@@ -71,10 +80,14 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f\u0431.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
-    "longDate": "d MMMM y",
-    "medium": "d MMM y HH:mm:ss",
-    "mediumDate": "d MMM y",
+    "longDate": "d MMMM y '\u0433'.",
+    "medium": "d MMM y '\u0433'. HH:mm:ss",
+    "mediumDate": "d MMM y '\u0433'.",
     "mediumTime": "HH:mm:ss",
     "short": "dd.MM.yy HH:mm",
     "shortDate": "dd.MM.yy",
diff --git a/src/ngLocale/angular-locale_ru.js b/src/ngLocale/angular-locale_ru.js
index ef6908ab3863..553360f025fc 100644
--- a/src/ngLocale/angular-locale_ru.js
+++ b/src/ngLocale/angular-locale_ru.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
       "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d. \u044d.",
+      "\u043d. \u044d."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u044f\u043d\u0432\u0430\u0440\u044f",
       "\u0444\u0435\u0432\u0440\u0430\u043b\u044f",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u044f\u0431.",
       "\u0434\u0435\u043a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0433'.",
     "longDate": "d MMMM y '\u0433'.",
     "medium": "d MMM y '\u0433'. H:mm:ss",
diff --git a/src/ngLocale/angular-locale_rw-rw.js b/src/ngLocale/angular-locale_rw-rw.js
index 162fe589d425..7e679df6b9c0 100644
--- a/src/ngLocale/angular-locale_rw-rw.js
+++ b/src/ngLocale/angular-locale_rw-rw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Kuwa gatanu",
       "Kuwa gatandatu"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mutarama",
       "Gashyantare",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ugu.",
       "uku."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_rw.js b/src/ngLocale/angular-locale_rw.js
index 9d2bc6300115..2e5db17a54f1 100644
--- a/src/ngLocale/angular-locale_rw.js
+++ b/src/ngLocale/angular-locale_rw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Kuwa gatanu",
       "Kuwa gatandatu"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mutarama",
       "Gashyantare",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "ugu.",
       "uku."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_rwk-tz.js b/src/ngLocale/angular-locale_rwk-tz.js
index 64cf03d33115..3dcb29aea7dc 100644
--- a/src/ngLocale/angular-locale_rwk-tz.js
+++ b/src/ngLocale/angular-locale_rwk-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristu",
+      "Baada ya Kristu"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_rwk.js b/src/ngLocale/angular-locale_rwk.js
index c32b84b76350..726ed59ad231 100644
--- a/src/ngLocale/angular-locale_rwk.js
+++ b/src/ngLocale/angular-locale_rwk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristu",
+      "Baada ya Kristu"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_sah-ru.js b/src/ngLocale/angular-locale_sah-ru.js
index c5e26740c04a..85b3776f2bd5 100644
--- a/src/ngLocale/angular-locale_sah-ru.js
+++ b/src/ngLocale/angular-locale_sah-ru.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0411\u044d\u044d\u0442\u0438\u04a5\u0441\u044d",
       "\u0421\u0443\u0431\u0443\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0431. \u044d. \u0438.",
+      "\u0431. \u044d"
+    ],
+    "ERAS": [
+      "\u0431. \u044d. \u0438.",
+      "\u0431. \u044d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0422\u043e\u0445\u0441\u0443\u043d\u043d\u044c\u0443",
       "\u041e\u043b\u0443\u043d\u043d\u044c\u0443",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0421\u044d\u0442",
       "\u0410\u0445\u0441"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y '\u0441\u044b\u043b' MMMM d '\u043a\u04af\u043d\u044d', EEEE",
     "longDate": "y, MMMM d",
     "medium": "y, MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sah.js b/src/ngLocale/angular-locale_sah.js
index f25ca75a6be2..23bd88ee59e7 100644
--- a/src/ngLocale/angular-locale_sah.js
+++ b/src/ngLocale/angular-locale_sah.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0411\u044d\u044d\u0442\u0438\u04a5\u0441\u044d",
       "\u0421\u0443\u0431\u0443\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0431. \u044d. \u0438.",
+      "\u0431. \u044d"
+    ],
+    "ERAS": [
+      "\u0431. \u044d. \u0438.",
+      "\u0431. \u044d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0422\u043e\u0445\u0441\u0443\u043d\u043d\u044c\u0443",
       "\u041e\u043b\u0443\u043d\u043d\u044c\u0443",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0421\u044d\u0442",
       "\u0410\u0445\u0441"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y '\u0441\u044b\u043b' MMMM d '\u043a\u04af\u043d\u044d', EEEE",
     "longDate": "y, MMMM d",
     "medium": "y, MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_saq-ke.js b/src/ngLocale/angular-locale_saq-ke.js
index 7b8fb71469c8..a7f8998041e1 100644
--- a/src/ngLocale/angular-locale_saq-ke.js
+++ b/src/ngLocale/angular-locale_saq-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Mderot ee sapa",
       "Mderot ee kwe"
     ],
+    "ERANAMES": [
+      "Kabla ya Christo",
+      "Baada ya Christo"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Lapa le obo",
       "Lapa le waare",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Tob",
       "Tow"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_saq.js b/src/ngLocale/angular-locale_saq.js
index 7556ece66478..b515603a9a59 100644
--- a/src/ngLocale/angular-locale_saq.js
+++ b/src/ngLocale/angular-locale_saq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Mderot ee sapa",
       "Mderot ee kwe"
     ],
+    "ERANAMES": [
+      "Kabla ya Christo",
+      "Baada ya Christo"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Lapa le obo",
       "Lapa le waare",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Tob",
       "Tow"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sbp-tz.js b/src/ngLocale/angular-locale_sbp-tz.js
index 73c211f28bed..1e5a0e825c40 100644
--- a/src/ngLocale/angular-locale_sbp-tz.js
+++ b/src/ngLocale/angular-locale_sbp-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Ashanali uKilisito",
+      "Pamwandi ya Kilisto"
+    ],
+    "ERAS": [
+      "AK",
+      "PK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mupalangulwa",
       "Mwitope",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Mus",
       "Muh"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_sbp.js b/src/ngLocale/angular-locale_sbp.js
index 00d29a7c72dd..da6106a6a81a 100644
--- a/src/ngLocale/angular-locale_sbp.js
+++ b/src/ngLocale/angular-locale_sbp.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Ashanali uKilisito",
+      "Pamwandi ya Kilisto"
+    ],
+    "ERAS": [
+      "AK",
+      "PK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Mupalangulwa",
       "Mwitope",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Mus",
       "Muh"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_se-fi.js b/src/ngLocale/angular-locale_se-fi.js
index 24edfe449d7b..62de6b1ada6b 100644
--- a/src/ngLocale/angular-locale_se-fi.js
+++ b/src/ngLocale/angular-locale_se-fi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "bearjadahke",
       "laavadahke"
     ],
+    "ERANAMES": [
+      "ovdal Kristtusa",
+      "ma\u014b\u014bel Kristtusa"
+    ],
+    "ERAS": [
+      "o.Kr.",
+      "m.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "o\u0111\u0111ajagem\u00e1nnu",
       "guovvam\u00e1nnu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "sk\u00e1bma",
       "juovla"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_se-no.js b/src/ngLocale/angular-locale_se-no.js
index 63e8327232ed..b2e24ae6afbb 100644
--- a/src/ngLocale/angular-locale_se-no.js
+++ b/src/ngLocale/angular-locale_se-no.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "bearjadat",
       "l\u00e1vvardat"
     ],
+    "ERANAMES": [
+      "ovdal Kristtusa",
+      "ma\u014b\u014bel Kristtusa"
+    ],
+    "ERAS": [
+      "o.Kr.",
+      "m.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "o\u0111\u0111ajagem\u00e1nnu",
       "guovvam\u00e1nnu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "sk\u00e1b",
       "juov"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_se-se.js b/src/ngLocale/angular-locale_se-se.js
index 1a5192e874ac..7915d431c94a 100644
--- a/src/ngLocale/angular-locale_se-se.js
+++ b/src/ngLocale/angular-locale_se-se.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "bearjadat",
       "l\u00e1vvardat"
     ],
+    "ERANAMES": [
+      "ovdal Kristtusa",
+      "ma\u014b\u014bel Kristtusa"
+    ],
+    "ERAS": [
+      "o.Kr.",
+      "m.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "o\u0111\u0111ajagem\u00e1nnu",
       "guovvam\u00e1nnu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "sk\u00e1b",
       "juov"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_se.js b/src/ngLocale/angular-locale_se.js
index d49cff3116f8..0a6d7d665482 100644
--- a/src/ngLocale/angular-locale_se.js
+++ b/src/ngLocale/angular-locale_se.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "bearjadat",
       "l\u00e1vvardat"
     ],
+    "ERANAMES": [
+      "ovdal Kristtusa",
+      "ma\u014b\u014bel Kristtusa"
+    ],
+    "ERAS": [
+      "o.Kr.",
+      "m.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "o\u0111\u0111ajagem\u00e1nnu",
       "guovvam\u00e1nnu",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "sk\u00e1b",
       "juov"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_seh-mz.js b/src/ngLocale/angular-locale_seh-mz.js
index d6f93da544a1..f723c867881d 100644
--- a/src/ngLocale/angular-locale_seh-mz.js
+++ b/src/ngLocale/angular-locale_seh-mz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Chishanu",
       "Sabudu"
     ],
+    "ERANAMES": [
+      "Antes de Cristo",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "AC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janeiro",
       "Fevreiro",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "d 'de' MMM 'de' y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_seh.js b/src/ngLocale/angular-locale_seh.js
index c7bd7f4594f9..d9c55eecfdd9 100644
--- a/src/ngLocale/angular-locale_seh.js
+++ b/src/ngLocale/angular-locale_seh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Chishanu",
       "Sabudu"
     ],
+    "ERANAMES": [
+      "Antes de Cristo",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "AC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janeiro",
       "Fevreiro",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d 'de' MMMM 'de' y",
     "longDate": "d 'de' MMMM 'de' y",
     "medium": "d 'de' MMM 'de' y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ses-ml.js b/src/ngLocale/angular-locale_ses-ml.js
index 299029e08333..596dfe43b05e 100644
--- a/src/ngLocale/angular-locale_ses-ml.js
+++ b/src/ngLocale/angular-locale_ses-ml.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Alzuma",
       "Asibti"
     ],
+    "ERANAMES": [
+      "Isaa jine",
+      "Isaa zamanoo"
+    ],
+    "ERAS": [
+      "IJ",
+      "IZ"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u017danwiye",
       "Feewiriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Noo",
       "Dee"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ses.js b/src/ngLocale/angular-locale_ses.js
index 5db30038c3ae..e150d779fe21 100644
--- a/src/ngLocale/angular-locale_ses.js
+++ b/src/ngLocale/angular-locale_ses.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Alzuma",
       "Asibti"
     ],
+    "ERANAMES": [
+      "Isaa jine",
+      "Isaa zamanoo"
+    ],
+    "ERAS": [
+      "IJ",
+      "IZ"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u017danwiye",
       "Feewiriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Noo",
       "Dee"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sg-cf.js b/src/ngLocale/angular-locale_sg-cf.js
index dd02fdd63f7b..fb6d2f76c8cf 100644
--- a/src/ngLocale/angular-locale_sg-cf.js
+++ b/src/ngLocale/angular-locale_sg-cf.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "L\u00e2p\u00f4s\u00f6",
       "L\u00e2yenga"
     ],
+    "ERANAMES": [
+      "K\u00f4zo na Kr\u00eestu",
+      "Na pek\u00f4 t\u00ee Kr\u00eestu"
+    ],
+    "ERAS": [
+      "KnK",
+      "NpK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Nyenye",
       "Fulund\u00efgi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nab",
       "Kak"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sg.js b/src/ngLocale/angular-locale_sg.js
index 5acc442e53de..3b671dae11ef 100644
--- a/src/ngLocale/angular-locale_sg.js
+++ b/src/ngLocale/angular-locale_sg.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "L\u00e2p\u00f4s\u00f6",
       "L\u00e2yenga"
     ],
+    "ERANAMES": [
+      "K\u00f4zo na Kr\u00eestu",
+      "Na pek\u00f4 t\u00ee Kr\u00eestu"
+    ],
+    "ERAS": [
+      "KnK",
+      "NpK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Nyenye",
       "Fulund\u00efgi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nab",
       "Kak"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_shi-latn-ma.js b/src/ngLocale/angular-locale_shi-latn-ma.js
index c10d408e4869..02156c6921b6 100644
--- a/src/ngLocale/angular-locale_shi-latn-ma.js
+++ b/src/ngLocale/angular-locale_shi-latn-ma.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "asimwas",
       "asi\u1e0dyas"
     ],
+    "ERANAMES": [
+      "dat n \u025bisa",
+      "dffir n \u025bisa"
+    ],
+    "ERAS": [
+      "da\u025b",
+      "df\u025b"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "innayr",
       "b\u1e5bay\u1e5b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nuw",
       "duj"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_shi-latn.js b/src/ngLocale/angular-locale_shi-latn.js
index 62a7a15dde34..6b8b6f7042ce 100644
--- a/src/ngLocale/angular-locale_shi-latn.js
+++ b/src/ngLocale/angular-locale_shi-latn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "asimwas",
       "asi\u1e0dyas"
     ],
+    "ERANAMES": [
+      "dat n \u025bisa",
+      "dffir n \u025bisa"
+    ],
+    "ERAS": [
+      "da\u025b",
+      "df\u025b"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "innayr",
       "b\u1e5bay\u1e5b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nuw",
       "duj"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "dh",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": "\u00a0",
     "PATTERNS": [
diff --git a/src/ngLocale/angular-locale_shi-tfng-ma.js b/src/ngLocale/angular-locale_shi-tfng-ma.js
index fe0025428f8a..998d17a2f315 100644
--- a/src/ngLocale/angular-locale_shi-tfng-ma.js
+++ b/src/ngLocale/angular-locale_shi-tfng-ma.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59",
       "\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59"
     ],
+    "ERANAMES": [
+      "\u2d37\u2d30\u2d5c \u2d4f \u2d44\u2d49\u2d59\u2d30",
+      "\u2d37\u2d3c\u2d3c\u2d49\u2d54 \u2d4f \u2d44\u2d49\u2d59\u2d30"
+    ],
+    "ERAS": [
+      "\u2d37\u2d30\u2d44",
+      "\u2d37\u2d3c\u2d44"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54",
       "\u2d31\u2d55\u2d30\u2d62\u2d55",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u2d4f\u2d53\u2d61",
       "\u2d37\u2d53\u2d4a"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_shi-tfng.js b/src/ngLocale/angular-locale_shi-tfng.js
index 9adaaa0e7694..a2d825b3243b 100644
--- a/src/ngLocale/angular-locale_shi-tfng.js
+++ b/src/ngLocale/angular-locale_shi-tfng.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59",
       "\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59"
     ],
+    "ERANAMES": [
+      "\u2d37\u2d30\u2d5c \u2d4f \u2d44\u2d49\u2d59\u2d30",
+      "\u2d37\u2d3c\u2d3c\u2d49\u2d54 \u2d4f \u2d44\u2d49\u2d59\u2d30"
+    ],
+    "ERAS": [
+      "\u2d37\u2d30\u2d44",
+      "\u2d37\u2d3c\u2d44"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54",
       "\u2d31\u2d55\u2d30\u2d62\u2d55",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u2d4f\u2d53\u2d61",
       "\u2d37\u2d53\u2d4a"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "dh",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": "\u00a0",
     "PATTERNS": [
diff --git a/src/ngLocale/angular-locale_shi.js b/src/ngLocale/angular-locale_shi.js
index 3ed81276c594..5f2fe453d200 100644
--- a/src/ngLocale/angular-locale_shi.js
+++ b/src/ngLocale/angular-locale_shi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59",
       "\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59"
     ],
+    "ERANAMES": [
+      "\u2d37\u2d30\u2d5c \u2d4f \u2d44\u2d49\u2d59\u2d30",
+      "\u2d37\u2d3c\u2d3c\u2d49\u2d54 \u2d4f \u2d44\u2d49\u2d59\u2d30"
+    ],
+    "ERAS": [
+      "\u2d37\u2d30\u2d44",
+      "\u2d37\u2d3c\u2d44"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54",
       "\u2d31\u2d55\u2d30\u2d62\u2d55",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u2d4f\u2d53\u2d61",
       "\u2d37\u2d53\u2d4a"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_si-lk.js b/src/ngLocale/angular-locale_si-lk.js
index aa359567aa1b..c216c7530654 100644
--- a/src/ngLocale/angular-locale_si-lk.js
+++ b/src/ngLocale/angular-locale_si-lk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0dc3\u0dd2\u0d9a\u0dd4\u0dbb\u0dcf\u0daf\u0dcf",
       "\u0dc3\u0dd9\u0db1\u0dc3\u0dd4\u0dbb\u0dcf\u0daf\u0dcf"
     ],
+    "ERANAMES": [
+      "\u0d9a\u0dca\u200d\u0dbb\u0dd2\u0dc3\u0dca\u0dad\u0dd4 \u0db4\u0dd6\u0dbb\u0dca\u200d\u0dc0",
+      "\u0d9a\u0dca\u200d\u0dbb\u0dd2\u0dc3\u0dca\u0dad\u0dd4 \u0dc0\u0dbb\u0dca\u200d\u0dc2"
+    ],
+    "ERAS": [
+      "\u0d9a\u0dca\u200d\u0dbb\u0dd2.\u0db4\u0dd6.",
+      "\u0d9a\u0dca\u200d\u0dbb\u0dd2.\u0dc0."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0da2\u0db1\u0dc0\u0dcf\u0dbb\u0dd2",
       "\u0db4\u0dd9\u0db6\u0dbb\u0dc0\u0dcf\u0dbb\u0dd2",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0db1\u0ddc\u0dc0\u0dd0",
       "\u0daf\u0dd9\u0dc3\u0dd0"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d a h.mm.ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_si.js b/src/ngLocale/angular-locale_si.js
index 9ecb8b22afd3..bfcdd628f21e 100644
--- a/src/ngLocale/angular-locale_si.js
+++ b/src/ngLocale/angular-locale_si.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0dc3\u0dd2\u0d9a\u0dd4\u0dbb\u0dcf\u0daf\u0dcf",
       "\u0dc3\u0dd9\u0db1\u0dc3\u0dd4\u0dbb\u0dcf\u0daf\u0dcf"
     ],
+    "ERANAMES": [
+      "\u0d9a\u0dca\u200d\u0dbb\u0dd2\u0dc3\u0dca\u0dad\u0dd4 \u0db4\u0dd6\u0dbb\u0dca\u200d\u0dc0",
+      "\u0d9a\u0dca\u200d\u0dbb\u0dd2\u0dc3\u0dca\u0dad\u0dd4 \u0dc0\u0dbb\u0dca\u200d\u0dc2"
+    ],
+    "ERAS": [
+      "\u0d9a\u0dca\u200d\u0dbb\u0dd2.\u0db4\u0dd6.",
+      "\u0d9a\u0dca\u200d\u0dbb\u0dd2.\u0dc0."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0da2\u0db1\u0dc0\u0dcf\u0dbb\u0dd2",
       "\u0db4\u0dd9\u0db6\u0dbb\u0dc0\u0dcf\u0dbb\u0dd2",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0db1\u0ddc\u0dc0\u0dd0",
       "\u0daf\u0dd9\u0dc3\u0dd0"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d a h.mm.ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sk-sk.js b/src/ngLocale/angular-locale_sk-sk.js
index d5a561f4831b..01f0f0cb42ef 100644
--- a/src/ngLocale/angular-locale_sk-sk.js
+++ b/src/ngLocale/angular-locale_sk-sk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "piatok",
       "sobota"
     ],
+    "ERANAMES": [
+      "pred Kristom",
+      "po Kristovi"
+    ],
+    "ERAS": [
+      "pred Kr.",
+      "po Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janu\u00e1ra",
       "febru\u00e1ra",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. M. y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_sk.js b/src/ngLocale/angular-locale_sk.js
index 3e8fcea85d69..7618fe3835dd 100644
--- a/src/ngLocale/angular-locale_sk.js
+++ b/src/ngLocale/angular-locale_sk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "piatok",
       "sobota"
     ],
+    "ERANAMES": [
+      "pred Kristom",
+      "po Kristovi"
+    ],
+    "ERAS": [
+      "pred Kr.",
+      "po Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janu\u00e1ra",
       "febru\u00e1ra",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. M. y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_sl-si.js b/src/ngLocale/angular-locale_sl-si.js
index 79ca17e0338c..f480b7895180 100644
--- a/src/ngLocale/angular-locale_sl-si.js
+++ b/src/ngLocale/angular-locale_sl-si.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petek",
       "sobota"
     ],
+    "ERANAMES": [
+      "pred na\u0161im \u0161tetjem",
+      "na\u0161e \u0161tetje"
+    ],
+    "ERAS": [
+      "pr. n. \u0161t.",
+      "po Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y",
     "longDate": "dd. MMMM y",
-    "medium": "d. MMM y HH.mm.ss",
+    "medium": "d. MMM y HH:mm:ss",
     "mediumDate": "d. MMM y",
-    "mediumTime": "HH.mm.ss",
-    "short": "d. MM. yy HH.mm",
+    "mediumTime": "HH:mm:ss",
+    "short": "d. MM. yy HH:mm",
     "shortDate": "d. MM. yy",
-    "shortTime": "HH.mm"
+    "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u20ac",
diff --git a/src/ngLocale/angular-locale_sl.js b/src/ngLocale/angular-locale_sl.js
index 63a1364cef17..24d4a779f3d5 100644
--- a/src/ngLocale/angular-locale_sl.js
+++ b/src/ngLocale/angular-locale_sl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petek",
       "sobota"
     ],
+    "ERANAMES": [
+      "pred na\u0161im \u0161tetjem",
+      "na\u0161e \u0161tetje"
+    ],
+    "ERAS": [
+      "pr. n. \u0161t.",
+      "po Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,14 +80,18 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y",
     "longDate": "dd. MMMM y",
-    "medium": "d. MMM y HH.mm.ss",
+    "medium": "d. MMM y HH:mm:ss",
     "mediumDate": "d. MMM y",
-    "mediumTime": "HH.mm.ss",
-    "short": "d. MM. yy HH.mm",
+    "mediumTime": "HH:mm:ss",
+    "short": "d. MM. yy HH:mm",
     "shortDate": "d. MM. yy",
-    "shortTime": "HH.mm"
+    "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "\u20ac",
diff --git a/src/ngLocale/angular-locale_smn-fi.js b/src/ngLocale/angular-locale_smn-fi.js
index ad729bfda63f..027b0a2c88db 100644
--- a/src/ngLocale/angular-locale_smn-fi.js
+++ b/src/ngLocale/angular-locale_smn-fi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "v\u00e1stuppeeivi",
       "l\u00e1vurduv"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "M01",
       "M02",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "M11",
       "M12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_smn.js b/src/ngLocale/angular-locale_smn.js
index 4c5a8b6aa9b3..68c71cfaf367 100644
--- a/src/ngLocale/angular-locale_smn.js
+++ b/src/ngLocale/angular-locale_smn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "v\u00e1stuppeeivi",
       "l\u00e1vurduv"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "M01",
       "M02",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "M11",
       "M12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sn-zw.js b/src/ngLocale/angular-locale_sn-zw.js
index faa32a5bbfed..1d8cd0ffb1af 100644
--- a/src/ngLocale/angular-locale_sn-zw.js
+++ b/src/ngLocale/angular-locale_sn-zw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Chishanu",
       "Mugovera"
     ],
+    "ERANAMES": [
+      "Kristo asati auya",
+      "Kristo ashaya"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ndira",
       "Kukadzi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Mb",
       "Zvi"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sn.js b/src/ngLocale/angular-locale_sn.js
index e0e02a8ce992..7b16b4dc258e 100644
--- a/src/ngLocale/angular-locale_sn.js
+++ b/src/ngLocale/angular-locale_sn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Chishanu",
       "Mugovera"
     ],
+    "ERANAMES": [
+      "Kristo asati auya",
+      "Kristo ashaya"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ndira",
       "Kukadzi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Mb",
       "Zvi"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_so-dj.js b/src/ngLocale/angular-locale_so-dj.js
index ca490f2dd74e..d8307cbda7e7 100644
--- a/src/ngLocale/angular-locale_so-dj.js
+++ b/src/ngLocale/angular-locale_so-dj.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jimco",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Ciise ka hor (CS)",
+      "Ciise ka dib (CS)"
+    ],
+    "ERAS": [
+      "CK",
+      "CD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Bisha Koobaad",
       "Bisha Labaad",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KIT",
       "LIT"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_so-et.js b/src/ngLocale/angular-locale_so-et.js
index dcff4b6868f2..ef34ea2c8e17 100644
--- a/src/ngLocale/angular-locale_so-et.js
+++ b/src/ngLocale/angular-locale_so-et.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jimco",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Ciise ka hor (CS)",
+      "Ciise ka dib (CS)"
+    ],
+    "ERAS": [
+      "CK",
+      "CD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Bisha Koobaad",
       "Bisha Labaad",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KIT",
       "LIT"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_so-ke.js b/src/ngLocale/angular-locale_so-ke.js
index 87bd18b79ae0..67fc74e0162e 100644
--- a/src/ngLocale/angular-locale_so-ke.js
+++ b/src/ngLocale/angular-locale_so-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jimco",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Ciise ka hor (CS)",
+      "Ciise ka dib (CS)"
+    ],
+    "ERAS": [
+      "CK",
+      "CD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Bisha Koobaad",
       "Bisha Labaad",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KIT",
       "LIT"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_so-so.js b/src/ngLocale/angular-locale_so-so.js
index fbe5b31a55bb..c91a42358446 100644
--- a/src/ngLocale/angular-locale_so-so.js
+++ b/src/ngLocale/angular-locale_so-so.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jimco",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Ciise ka hor (CS)",
+      "Ciise ka dib (CS)"
+    ],
+    "ERAS": [
+      "CK",
+      "CD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Bisha Koobaad",
       "Bisha Labaad",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KIT",
       "LIT"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_so.js b/src/ngLocale/angular-locale_so.js
index 5ca3fa678983..743a24ba98bd 100644
--- a/src/ngLocale/angular-locale_so.js
+++ b/src/ngLocale/angular-locale_so.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jimco",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Ciise ka hor (CS)",
+      "Ciise ka dib (CS)"
+    ],
+    "ERAS": [
+      "CK",
+      "CD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Bisha Koobaad",
       "Bisha Labaad",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "KIT",
       "LIT"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sq-al.js b/src/ngLocale/angular-locale_sq-al.js
index bf9f9269dc80..6dac5e79ef1e 100644
--- a/src/ngLocale/angular-locale_sq-al.js
+++ b/src/ngLocale/angular-locale_sq-al.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "e premte",
       "e shtun\u00eb"
     ],
+    "ERANAMES": [
+      "para er\u00ebs s\u00eb re",
+      "er\u00ebs s\u00eb re"
+    ],
+    "ERAS": [
+      "p.e.r.",
+      "e.r."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janar",
       "shkurt",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "N\u00ebn",
       "Dhj"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sq-mk.js b/src/ngLocale/angular-locale_sq-mk.js
index c7fcbf9a92fb..e7f5c31e1bea 100644
--- a/src/ngLocale/angular-locale_sq-mk.js
+++ b/src/ngLocale/angular-locale_sq-mk.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "e premte",
       "e shtun\u00eb"
     ],
+    "ERANAMES": [
+      "para er\u00ebs s\u00eb re",
+      "er\u00ebs s\u00eb re"
+    ],
+    "ERAS": [
+      "p.e.r.",
+      "e.r."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janar",
       "shkurt",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "N\u00ebn",
       "Dhj"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sq-xk.js b/src/ngLocale/angular-locale_sq-xk.js
index 8ffa642bd903..ccdf61f562b6 100644
--- a/src/ngLocale/angular-locale_sq-xk.js
+++ b/src/ngLocale/angular-locale_sq-xk.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "e premte",
       "e shtun\u00eb"
     ],
+    "ERANAMES": [
+      "para er\u00ebs s\u00eb re",
+      "er\u00ebs s\u00eb re"
+    ],
+    "ERAS": [
+      "p.e.r.",
+      "e.r."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janar",
       "shkurt",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "N\u00ebn",
       "Dhj"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sq.js b/src/ngLocale/angular-locale_sq.js
index 6b458cd4a11b..bc614eedb67f 100644
--- a/src/ngLocale/angular-locale_sq.js
+++ b/src/ngLocale/angular-locale_sq.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "e premte",
       "e shtun\u00eb"
     ],
+    "ERANAMES": [
+      "para er\u00ebs s\u00eb re",
+      "er\u00ebs s\u00eb re"
+    ],
+    "ERAS": [
+      "p.e.r.",
+      "e.r."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janar",
       "shkurt",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "N\u00ebn",
       "Dhj"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sr-cyrl-ba.js b/src/ngLocale/angular-locale_sr-cyrl-ba.js
index d9f3e6b97681..e3843b15953e 100644
--- a/src/ngLocale/angular-locale_sr-cyrl-ba.js
+++ b/src/ngLocale/angular-locale_sr-cyrl-ba.js
@@ -29,19 +29,28 @@ $provide.value("$locale", {
       "\u043d\u0435\u0434\u0435\u0459\u0430",
       "\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u0430\u043a",
       "\u0443\u0442\u043e\u0440\u0430\u043a",
-      "\u0441\u0440\u0438\u0458\u0435\u0434\u0430",
+      "\u0441\u0440\u0435\u0434\u0430",
       "\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043a",
       "\u043f\u0435\u0442\u0430\u043a",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+      "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435"
+    ],
+    "ERAS": [
+      "\u043f. \u043d. \u0435.",
+      "\u043d. \u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440",
       "\u0444\u0435\u0431\u0440\u0443\u0430\u0440",
       "\u043c\u0430\u0440\u0442",
       "\u0430\u043f\u0440\u0438\u043b",
       "\u043c\u0430\u0458",
-      "\u0458\u0443\u043d\u0438",
-      "\u0458\u0443\u043b\u0438",
+      "\u0458\u0443\u043d",
+      "\u0458\u0443\u043b",
       "\u0430\u0432\u0433\u0443\u0441\u0442",
       "\u0441\u0435\u043f\u0442\u0435\u043c\u0431\u0430\u0440",
       "\u043e\u043a\u0442\u043e\u0431\u0430\u0440",
@@ -52,7 +61,7 @@ $provide.value("$locale", {
       "\u043d\u0435\u0434",
       "\u043f\u043e\u043d",
       "\u0443\u0442\u043e",
-      "\u0441\u0440\u0438",
+      "\u0441\u0440\u0435",
       "\u0447\u0435\u0442",
       "\u043f\u0435\u0442",
       "\u0441\u0443\u0431"
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "\u043d\u043e\u0432",
       "\u0434\u0435\u0446"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
-    "medium": "y-MM-dd HH:mm:ss",
-    "mediumDate": "y-MM-dd",
+    "medium": "dd.MM.y. HH:mm:ss",
+    "mediumDate": "dd.MM.y.",
     "mediumTime": "HH:mm:ss",
-    "short": "yy-MM-dd HH:mm",
-    "shortDate": "yy-MM-dd",
+    "short": "d.M.yy. HH:mm",
+    "shortDate": "d.M.yy.",
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
diff --git a/src/ngLocale/angular-locale_sr-cyrl-me.js b/src/ngLocale/angular-locale_sr-cyrl-me.js
index dcdf461027ec..3bf9c2cc07b6 100644
--- a/src/ngLocale/angular-locale_sr-cyrl-me.js
+++ b/src/ngLocale/angular-locale_sr-cyrl-me.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u0430\u043a",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+      "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435"
+    ],
+    "ERAS": [
+      "\u043f. \u043d. \u0435.",
+      "\u043d. \u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440",
       "\u0444\u0435\u0431\u0440\u0443\u0430\u0440",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0432",
       "\u0434\u0435\u0446"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
diff --git a/src/ngLocale/angular-locale_sr-cyrl-rs.js b/src/ngLocale/angular-locale_sr-cyrl-rs.js
index 72437869fa63..0f883f0bb7c7 100644
--- a/src/ngLocale/angular-locale_sr-cyrl-rs.js
+++ b/src/ngLocale/angular-locale_sr-cyrl-rs.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u0430\u043a",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+      "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435"
+    ],
+    "ERAS": [
+      "\u043f. \u043d. \u0435.",
+      "\u043d. \u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440",
       "\u0444\u0435\u0431\u0440\u0443\u0430\u0440",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0432",
       "\u0434\u0435\u0446"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
diff --git a/src/ngLocale/angular-locale_sr-cyrl-xk.js b/src/ngLocale/angular-locale_sr-cyrl-xk.js
index c05b1d27d774..cf7c3e2fd49b 100644
--- a/src/ngLocale/angular-locale_sr-cyrl-xk.js
+++ b/src/ngLocale/angular-locale_sr-cyrl-xk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u0430\u043a",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+      "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435"
+    ],
+    "ERAS": [
+      "\u043f. \u043d. \u0435.",
+      "\u043d. \u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440",
       "\u0444\u0435\u0431\u0440\u0443\u0430\u0440",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0432",
       "\u0434\u0435\u0446"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
diff --git a/src/ngLocale/angular-locale_sr-cyrl.js b/src/ngLocale/angular-locale_sr-cyrl.js
index c20e3cdb9ec2..a917cf7fd093 100644
--- a/src/ngLocale/angular-locale_sr-cyrl.js
+++ b/src/ngLocale/angular-locale_sr-cyrl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u0430\u043a",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+      "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435"
+    ],
+    "ERAS": [
+      "\u043f. \u043d. \u0435.",
+      "\u043d. \u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440",
       "\u0444\u0435\u0431\u0440\u0443\u0430\u0440",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0432",
       "\u0434\u0435\u0446"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "HH.mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "din",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": ".",
     "PATTERNS": [
diff --git a/src/ngLocale/angular-locale_sr-latn-ba.js b/src/ngLocale/angular-locale_sr-latn-ba.js
index 81c67a5513ed..54d8cd0e6b5c 100644
--- a/src/ngLocale/angular-locale_sr-latn-ba.js
+++ b/src/ngLocale/angular-locale_sr-latn-ba.js
@@ -29,19 +29,28 @@ $provide.value("$locale", {
       "nedelja",
       "ponedeljak",
       "utorak",
-      "srijeda",
+      "sreda",
       "\u010detvrtak",
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Pre nove ere",
+      "Nove ere"
+    ],
+    "ERAS": [
+      "p. n. e.",
+      "n. e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
       "mart",
       "april",
       "maj",
-      "juni",
-      "juli",
+      "jun",
+      "jul",
       "avgust",
       "septembar",
       "oktobar",
@@ -52,7 +61,7 @@ $provide.value("$locale", {
       "ned",
       "pon",
       "uto",
-      "sri",
+      "sre",
       "\u010det",
       "pet",
       "sub"
@@ -71,13 +80,17 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
-    "medium": "y-MM-dd HH:mm:ss",
-    "mediumDate": "y-MM-dd",
+    "medium": "dd.MM.y. HH:mm:ss",
+    "mediumDate": "dd.MM.y.",
     "mediumTime": "HH:mm:ss",
-    "short": "yy-MM-dd HH:mm",
-    "shortDate": "yy-MM-dd",
+    "short": "d.M.yy. HH:mm",
+    "shortDate": "d.M.yy.",
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
diff --git a/src/ngLocale/angular-locale_sr-latn-me.js b/src/ngLocale/angular-locale_sr-latn-me.js
index ab5e884f072e..cc0607a17aef 100644
--- a/src/ngLocale/angular-locale_sr-latn-me.js
+++ b/src/ngLocale/angular-locale_sr-latn-me.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Pre nove ere",
+      "Nove ere"
+    ],
+    "ERAS": [
+      "p. n. e.",
+      "n. e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
diff --git a/src/ngLocale/angular-locale_sr-latn-rs.js b/src/ngLocale/angular-locale_sr-latn-rs.js
index 578782f186e8..517e8eab6976 100644
--- a/src/ngLocale/angular-locale_sr-latn-rs.js
+++ b/src/ngLocale/angular-locale_sr-latn-rs.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Pre nove ere",
+      "Nove ere"
+    ],
+    "ERAS": [
+      "p. n. e.",
+      "n. e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
diff --git a/src/ngLocale/angular-locale_sr-latn-xk.js b/src/ngLocale/angular-locale_sr-latn-xk.js
index ca7ae8e4809e..1cb50a737a5b 100644
--- a/src/ngLocale/angular-locale_sr-latn-xk.js
+++ b/src/ngLocale/angular-locale_sr-latn-xk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Pre nove ere",
+      "Nove ere"
+    ],
+    "ERAS": [
+      "p. n. e.",
+      "n. e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
diff --git a/src/ngLocale/angular-locale_sr-latn.js b/src/ngLocale/angular-locale_sr-latn.js
index 8de1f7156f10..040041da2b3e 100644
--- a/src/ngLocale/angular-locale_sr-latn.js
+++ b/src/ngLocale/angular-locale_sr-latn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "petak",
       "subota"
     ],
+    "ERANAMES": [
+      "Pre nove ere",
+      "Nove ere"
+    ],
+    "ERAS": [
+      "p. n. e.",
+      "n. e."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januar",
       "februar",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dec"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
diff --git a/src/ngLocale/angular-locale_sr.js b/src/ngLocale/angular-locale_sr.js
index 6e4f5e5fc239..15f2f1de24bc 100644
--- a/src/ngLocale/angular-locale_sr.js
+++ b/src/ngLocale/angular-locale_sr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u0435\u0442\u0430\u043a",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+      "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435"
+    ],
+    "ERAS": [
+      "\u043f. \u043d. \u0435.",
+      "\u043d. \u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0458\u0430\u043d\u0443\u0430\u0440",
       "\u0444\u0435\u0431\u0440\u0443\u0430\u0440",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043d\u043e\u0432",
       "\u0434\u0435\u0446"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, dd. MMMM y.",
     "longDate": "dd. MMMM y.",
     "medium": "dd.MM.y. HH.mm.ss",
diff --git a/src/ngLocale/angular-locale_ss-sz.js b/src/ngLocale/angular-locale_ss-sz.js
index 09eb9717bec8..ae1fdd5f4dea 100644
--- a/src/ngLocale/angular-locale_ss-sz.js
+++ b/src/ngLocale/angular-locale_ss-sz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Lesihlanu",
       "uMgcibelo"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Bhimbidvwane",
       "iNdlovana",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Lwe",
       "Ngo"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ss-za.js b/src/ngLocale/angular-locale_ss-za.js
index 6fe15eea7b67..afb5b99b46b6 100644
--- a/src/ngLocale/angular-locale_ss-za.js
+++ b/src/ngLocale/angular-locale_ss-za.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Lesihlanu",
       "uMgcibelo"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Bhimbidvwane",
       "iNdlovana",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Lwe",
       "Ngo"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ss.js b/src/ngLocale/angular-locale_ss.js
index 202a58bdf9ed..3ff884606f1d 100644
--- a/src/ngLocale/angular-locale_ss.js
+++ b/src/ngLocale/angular-locale_ss.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Lesihlanu",
       "uMgcibelo"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Bhimbidvwane",
       "iNdlovana",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Lwe",
       "Ngo"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ssy-er.js b/src/ngLocale/angular-locale_ssy-er.js
index 24896fa5ee81..d4cb8e5dc46e 100644
--- a/src/ngLocale/angular-locale_ssy-er.js
+++ b/src/ngLocale/angular-locale_ssy-er.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jumqata",
       "Qunxa Sambat"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Qunxa Garablu",
       "Kudo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Xim",
       "Kax"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_ssy.js b/src/ngLocale/angular-locale_ssy.js
index 0b3f55bc3272..93c0eba09c32 100644
--- a/src/ngLocale/angular-locale_ssy.js
+++ b/src/ngLocale/angular-locale_ssy.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Jumqata",
       "Qunxa Sambat"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Qunxa Garablu",
       "Kudo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Xim",
       "Kax"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM dd, y",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_sv-ax.js b/src/ngLocale/angular-locale_sv-ax.js
index 1296a304ecb0..3c2e1f0d945d 100644
--- a/src/ngLocale/angular-locale_sv-ax.js
+++ b/src/ngLocale/angular-locale_sv-ax.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f6rdag"
     ],
+    "ERANAMES": [
+      "f\u00f6re Kristus",
+      "efter Kristus"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sv-fi.js b/src/ngLocale/angular-locale_sv-fi.js
index 7ccf4d6de4af..2d62ce66c8a3 100644
--- a/src/ngLocale/angular-locale_sv-fi.js
+++ b/src/ngLocale/angular-locale_sv-fi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f6rdag"
     ],
+    "ERANAMES": [
+      "f\u00f6re Kristus",
+      "efter Kristus"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,7 +80,11 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
-    "fullDate": "EEEE'en' 'den' d:'e' MMMM y",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
     "mediumDate": "d MMM y",
diff --git a/src/ngLocale/angular-locale_sv-se.js b/src/ngLocale/angular-locale_sv-se.js
index 52ef0d527c59..124285db403c 100644
--- a/src/ngLocale/angular-locale_sv-se.js
+++ b/src/ngLocale/angular-locale_sv-se.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f6rdag"
     ],
+    "ERANAMES": [
+      "f\u00f6re Kristus",
+      "efter Kristus"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sv.js b/src/ngLocale/angular-locale_sv.js
index 2943207fec32..dfd1aa78f503 100644
--- a/src/ngLocale/angular-locale_sv.js
+++ b/src/ngLocale/angular-locale_sv.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fredag",
       "l\u00f6rdag"
     ],
+    "ERANAMES": [
+      "f\u00f6re Kristus",
+      "efter Kristus"
+    ],
+    "ERAS": [
+      "f.Kr.",
+      "e.Kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "januari",
       "februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov.",
       "dec."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_sw-cd.js b/src/ngLocale/angular-locale_sw-cd.js
new file mode 100644
index 000000000000..b41d77c8b95e
--- /dev/null
+++ b/src/ngLocale/angular-locale_sw-cd.js
@@ -0,0 +1,128 @@
+'use strict';
+angular.module("ngLocale", [], ["$provide", function($provide) {
+var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
+function getDecimals(n) {
+  n = n + '';
+  var i = n.indexOf('.');
+  return (i == -1) ? 0 : n.length - i - 1;
+}
+
+function getVF(n, opt_precision) {
+  var v = opt_precision;
+
+  if (undefined === v) {
+    v = Math.min(getDecimals(n), 3);
+  }
+
+  var base = Math.pow(10, v);
+  var f = ((n * base) | 0) % base;
+  return {v: v, f: f};
+}
+
+$provide.value("$locale", {
+  "DATETIME_FORMATS": {
+    "AMPMS": [
+      "ya asubuyi",
+      "ya muchana"
+    ],
+    "DAY": [
+      "siku ya yenga",
+      "siku ya kwanza",
+      "siku ya pili",
+      "siku ya tatu",
+      "siku ya ine",
+      "siku ya tanu",
+      "siku ya sita"
+    ],
+    "ERANAMES": [
+      "Kabla ya Kristo",
+      "Baada ya Kristo"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
+    "MONTH": [
+      "mwezi ya kwanja",
+      "mwezi ya pili",
+      "mwezi ya tatu",
+      "mwezi ya ine",
+      "mwezi ya tanu",
+      "mwezi ya sita",
+      "mwezi ya saba",
+      "mwezi ya munane",
+      "mwezi ya tisa",
+      "mwezi ya kumi",
+      "mwezi ya kumi na moya",
+      "mwezi ya kumi ya mbili"
+    ],
+    "SHORTDAY": [
+      "yen",
+      "kwa",
+      "pil",
+      "tat",
+      "ine",
+      "tan",
+      "sit"
+    ],
+    "SHORTMONTH": [
+      "mkw",
+      "mpi",
+      "mtu",
+      "min",
+      "mtn",
+      "mst",
+      "msb",
+      "mun",
+      "mts",
+      "mku",
+      "mkm",
+      "mkb"
+    ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE d MMMM y",
+    "longDate": "d MMMM y",
+    "medium": "d MMM y HH:mm:ss",
+    "mediumDate": "d MMM y",
+    "mediumTime": "HH:mm:ss",
+    "short": "d/M/y HH:mm",
+    "shortDate": "d/M/y",
+    "shortTime": "HH:mm"
+  },
+  "NUMBER_FORMATS": {
+    "CURRENCY_SYM": "FrCD",
+    "DECIMAL_SEP": ",",
+    "GROUP_SEP": ".",
+    "PATTERNS": [
+      {
+        "gSize": 3,
+        "lgSize": 3,
+        "maxFrac": 3,
+        "minFrac": 0,
+        "minInt": 1,
+        "negPre": "-",
+        "negSuf": "",
+        "posPre": "",
+        "posSuf": ""
+      },
+      {
+        "gSize": 3,
+        "lgSize": 3,
+        "maxFrac": 2,
+        "minFrac": 2,
+        "minInt": 1,
+        "negPre": "-\u00a4",
+        "negSuf": "",
+        "posPre": "\u00a4",
+        "posSuf": ""
+      }
+    ]
+  },
+  "id": "sw-cd",
+  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+});
+}]);
diff --git a/src/ngLocale/angular-locale_sw-ke.js b/src/ngLocale/angular-locale_sw-ke.js
index 943ba5779f4d..6230e7c9e523 100644
--- a/src/ngLocale/angular-locale_sw-ke.js
+++ b/src/ngLocale/angular-locale_sw-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristo",
+      "Baada ya Kristo"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sw-tz.js b/src/ngLocale/angular-locale_sw-tz.js
index 3e498bacafc8..3f1cc2d23f96 100644
--- a/src/ngLocale/angular-locale_sw-tz.js
+++ b/src/ngLocale/angular-locale_sw-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristo",
+      "Baada ya Kristo"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sw-ug.js b/src/ngLocale/angular-locale_sw-ug.js
index fbb3328d6626..f2d0312014bf 100644
--- a/src/ngLocale/angular-locale_sw-ug.js
+++ b/src/ngLocale/angular-locale_sw-ug.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristo",
+      "Baada ya Kristo"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_sw.js b/src/ngLocale/angular-locale_sw.js
index c43ad72b680d..e6dd8fe8c08e 100644
--- a/src/ngLocale/angular-locale_sw.js
+++ b/src/ngLocale/angular-locale_sw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristo",
+      "Baada ya Kristo"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_swc-cd.js b/src/ngLocale/angular-locale_swc-cd.js
index 2de4a16355bf..4e51c1565df6 100644
--- a/src/ngLocale/angular-locale_swc-cd.js
+++ b/src/ngLocale/angular-locale_swc-cd.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "siku ya tanu",
       "siku ya sita"
     ],
+    "ERANAMES": [
+      "mbele ya Yezu Kristo",
+      "kisha ya Yezu Kristo"
+    ],
+    "ERAS": [
+      "mbele ya Y",
+      "kisha ya Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "mwezi ya kwanja",
       "mwezi ya pili",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "mkm",
       "mkb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_swc.js b/src/ngLocale/angular-locale_swc.js
index 7bf1185009c6..5390f3bfaed3 100644
--- a/src/ngLocale/angular-locale_swc.js
+++ b/src/ngLocale/angular-locale_swc.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "siku ya tanu",
       "siku ya sita"
     ],
+    "ERANAMES": [
+      "mbele ya Yezu Kristo",
+      "kisha ya Yezu Kristo"
+    ],
+    "ERAS": [
+      "mbele ya Y",
+      "kisha ya Y"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "mwezi ya kwanja",
       "mwezi ya pili",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "mkm",
       "mkb"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ta-in.js b/src/ngLocale/angular-locale_ta-in.js
index 6b6964453300..8ef2205a8a9f 100644
--- a/src/ngLocale/angular-locale_ta-in.js
+++ b/src/ngLocale/angular-locale_ta-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf",
       "\u0b9a\u0ba9\u0bbf"
     ],
+    "ERANAMES": [
+      "\u0b95\u0bbf\u0bb1\u0bbf\u0bb8\u0bcd\u0ba4\u0bc1\u0bb5\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd",
+      "\u0b85\u0ba9\u0bcb \u0b9f\u0bcb\u0bae\u0bbf\u0ba9\u0bbf"
+    ],
+    "ERAS": [
+      "\u0b95\u0bbf.\u0bae\u0bc1.",
+      "\u0b95\u0bbf.\u0baa\u0bbf."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf",
       "\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0ba8\u0bb5.",
       "\u0b9f\u0bbf\u0b9a."
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ta-lk.js b/src/ngLocale/angular-locale_ta-lk.js
index 4580322c9811..ffb0e7ca6e51 100644
--- a/src/ngLocale/angular-locale_ta-lk.js
+++ b/src/ngLocale/angular-locale_ta-lk.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf",
       "\u0b9a\u0ba9\u0bbf"
     ],
+    "ERANAMES": [
+      "\u0b95\u0bbf\u0bb1\u0bbf\u0bb8\u0bcd\u0ba4\u0bc1\u0bb5\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd",
+      "\u0b85\u0ba9\u0bcb \u0b9f\u0bcb\u0bae\u0bbf\u0ba9\u0bbf"
+    ],
+    "ERAS": [
+      "\u0b95\u0bbf.\u0bae\u0bc1.",
+      "\u0b95\u0bbf.\u0baa\u0bbf."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf",
       "\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0ba8\u0bb5.",
       "\u0b9f\u0bbf\u0b9a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ta-my.js b/src/ngLocale/angular-locale_ta-my.js
index 221e39b1e19e..3a9287a63cf0 100644
--- a/src/ngLocale/angular-locale_ta-my.js
+++ b/src/ngLocale/angular-locale_ta-my.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf",
       "\u0b9a\u0ba9\u0bbf"
     ],
+    "ERANAMES": [
+      "\u0b95\u0bbf\u0bb1\u0bbf\u0bb8\u0bcd\u0ba4\u0bc1\u0bb5\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd",
+      "\u0b85\u0ba9\u0bcb \u0b9f\u0bcb\u0bae\u0bbf\u0ba9\u0bbf"
+    ],
+    "ERAS": [
+      "\u0b95\u0bbf.\u0bae\u0bc1.",
+      "\u0b95\u0bbf.\u0baa\u0bbf."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf",
       "\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0ba8\u0bb5.",
       "\u0b9f\u0bbf\u0b9a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ta-sg.js b/src/ngLocale/angular-locale_ta-sg.js
index 6046d0b93c91..fc6a77d88ce6 100644
--- a/src/ngLocale/angular-locale_ta-sg.js
+++ b/src/ngLocale/angular-locale_ta-sg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf",
       "\u0b9a\u0ba9\u0bbf"
     ],
+    "ERANAMES": [
+      "\u0b95\u0bbf\u0bb1\u0bbf\u0bb8\u0bcd\u0ba4\u0bc1\u0bb5\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd",
+      "\u0b85\u0ba9\u0bcb \u0b9f\u0bcb\u0bae\u0bbf\u0ba9\u0bbf"
+    ],
+    "ERAS": [
+      "\u0b95\u0bbf.\u0bae\u0bc1.",
+      "\u0b95\u0bbf.\u0baa\u0bbf."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf",
       "\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0ba8\u0bb5.",
       "\u0b9f\u0bbf\u0b9a."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ta.js b/src/ngLocale/angular-locale_ta.js
index dd73dc397271..627262465791 100644
--- a/src/ngLocale/angular-locale_ta.js
+++ b/src/ngLocale/angular-locale_ta.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf",
       "\u0b9a\u0ba9\u0bbf"
     ],
+    "ERANAMES": [
+      "\u0b95\u0bbf\u0bb1\u0bbf\u0bb8\u0bcd\u0ba4\u0bc1\u0bb5\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd",
+      "\u0b85\u0ba9\u0bcb \u0b9f\u0bcb\u0bae\u0bbf\u0ba9\u0bbf"
+    ],
+    "ERAS": [
+      "\u0b95\u0bbf.\u0bae\u0bc1.",
+      "\u0b95\u0bbf.\u0baa\u0bbf."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf",
       "\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0ba8\u0bb5.",
       "\u0b9f\u0bbf\u0b9a."
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE, d MMMM, y",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_te-in.js b/src/ngLocale/angular-locale_te-in.js
index eedaa20d00de..fccdcfe8ca7a 100644
--- a/src/ngLocale/angular-locale_te-in.js
+++ b/src/ngLocale/angular-locale_te-in.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0c36\u0c41\u0c15\u0c4d\u0c30\u0c35\u0c3e\u0c30\u0c02",
       "\u0c36\u0c28\u0c3f\u0c35\u0c3e\u0c30\u0c02"
     ],
+    "ERANAMES": [
+      "\u0c15\u0c4d\u0c30\u0c40\u0c38\u0c4d\u0c24\u0c41 \u0c2a\u0c42\u0c30\u0c4d\u0c35\u0c02",
+      "\u0c15\u0c4d\u0c30\u0c40\u0c38\u0c4d\u0c24\u0c41 \u0c36\u0c15\u0c02"
+    ],
+    "ERAS": [
+      "\u0c15\u0c4d\u0c30\u0c40\u0c2a\u0c42",
+      "\u0c15\u0c4d\u0c30\u0c40\u0c36"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0c1c\u0c28\u0c35\u0c30\u0c3f",
       "\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0c28\u0c35\u0c02",
       "\u0c21\u0c3f\u0c38\u0c46\u0c02"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "d, MMMM y, EEEE",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_te.js b/src/ngLocale/angular-locale_te.js
index 5eb8ffd0dc44..a3c493fc3d60 100644
--- a/src/ngLocale/angular-locale_te.js
+++ b/src/ngLocale/angular-locale_te.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0c36\u0c41\u0c15\u0c4d\u0c30\u0c35\u0c3e\u0c30\u0c02",
       "\u0c36\u0c28\u0c3f\u0c35\u0c3e\u0c30\u0c02"
     ],
+    "ERANAMES": [
+      "\u0c15\u0c4d\u0c30\u0c40\u0c38\u0c4d\u0c24\u0c41 \u0c2a\u0c42\u0c30\u0c4d\u0c35\u0c02",
+      "\u0c15\u0c4d\u0c30\u0c40\u0c38\u0c4d\u0c24\u0c41 \u0c36\u0c15\u0c02"
+    ],
+    "ERAS": [
+      "\u0c15\u0c4d\u0c30\u0c40\u0c2a\u0c42",
+      "\u0c15\u0c4d\u0c30\u0c40\u0c36"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0c1c\u0c28\u0c35\u0c30\u0c3f",
       "\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0c28\u0c35\u0c02",
       "\u0c21\u0c3f\u0c38\u0c46\u0c02"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "d, MMMM y, EEEE",
     "longDate": "d MMMM, y",
     "medium": "d MMM, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_teo-ke.js b/src/ngLocale/angular-locale_teo-ke.js
index 155d0080dbb3..04178e1c5681 100644
--- a/src/ngLocale/angular-locale_teo-ke.js
+++ b/src/ngLocale/angular-locale_teo-ke.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Nakakany",
       "Nakasabiti"
     ],
+    "ERANAMES": [
+      "Kabla ya Christo",
+      "Baada ya Christo"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Orara",
       "Omuk",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Lab",
       "Poo"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_teo-ug.js b/src/ngLocale/angular-locale_teo-ug.js
index 665601ebd3e0..8a6e1a783ce8 100644
--- a/src/ngLocale/angular-locale_teo-ug.js
+++ b/src/ngLocale/angular-locale_teo-ug.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Nakakany",
       "Nakasabiti"
     ],
+    "ERANAMES": [
+      "Kabla ya Christo",
+      "Baada ya Christo"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Orara",
       "Omuk",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Lab",
       "Poo"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_teo.js b/src/ngLocale/angular-locale_teo.js
index 9ebbf24536c2..b3a750c60bec 100644
--- a/src/ngLocale/angular-locale_teo.js
+++ b/src/ngLocale/angular-locale_teo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Nakakany",
       "Nakasabiti"
     ],
+    "ERANAMES": [
+      "Kabla ya Christo",
+      "Baada ya Christo"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Orara",
       "Omuk",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Lab",
       "Poo"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_th-th.js b/src/ngLocale/angular-locale_th-th.js
index 7ff104e327a6..93c1cce8321c 100644
--- a/src/ngLocale/angular-locale_th-th.js
+++ b/src/ngLocale/angular-locale_th-th.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0e27\u0e31\u0e19\u0e28\u0e38\u0e01\u0e23\u0e4c",
       "\u0e27\u0e31\u0e19\u0e40\u0e2a\u0e32\u0e23\u0e4c"
     ],
+    "ERANAMES": [
+      "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a",
+      "\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a"
+    ],
+    "ERAS": [
+      "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19 \u0e04.\u0e28.",
+      "\u0e04.\u0e28."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0e21\u0e01\u0e23\u0e32\u0e04\u0e21",
       "\u0e01\u0e38\u0e21\u0e20\u0e32\u0e1e\u0e31\u0e19\u0e18\u0e4c",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0e1e.\u0e22.",
       "\u0e18.\u0e04."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u0e17\u0e35\u0e48 d MMMM G y",
     "longDate": "d MMMM G y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_th.js b/src/ngLocale/angular-locale_th.js
index aa9e4f5e0386..d9c21b282064 100644
--- a/src/ngLocale/angular-locale_th.js
+++ b/src/ngLocale/angular-locale_th.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0e27\u0e31\u0e19\u0e28\u0e38\u0e01\u0e23\u0e4c",
       "\u0e27\u0e31\u0e19\u0e40\u0e2a\u0e32\u0e23\u0e4c"
     ],
+    "ERANAMES": [
+      "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a",
+      "\u0e04\u0e23\u0e34\u0e2a\u0e15\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a"
+    ],
+    "ERAS": [
+      "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19 \u0e04.\u0e28.",
+      "\u0e04.\u0e28."
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u0e21\u0e01\u0e23\u0e32\u0e04\u0e21",
       "\u0e01\u0e38\u0e21\u0e20\u0e32\u0e1e\u0e31\u0e19\u0e18\u0e4c",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0e1e.\u0e22.",
       "\u0e18.\u0e04."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u0e17\u0e35\u0e48 d MMMM G y",
     "longDate": "d MMMM G y",
     "medium": "d MMM y HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ti-er.js b/src/ngLocale/angular-locale_ti-er.js
index 8fe072ce3a76..26948d7c219e 100644
--- a/src/ngLocale/angular-locale_ti-er.js
+++ b/src/ngLocale/angular-locale_ti-er.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u12d3\u122d\u1262",
       "\u1240\u12f3\u121d"
     ],
+    "ERANAMES": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
+    "ERAS": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u1325\u122a",
       "\u1208\u12ab\u1272\u1275",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u1215\u12f3\u122d",
       "\u1273\u1215\u1233"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u1361 dd MMMM \u1218\u12d3\u120d\u1272 y G",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ti-et.js b/src/ngLocale/angular-locale_ti-et.js
index 5deaec71ab92..1be479a0f54f 100644
--- a/src/ngLocale/angular-locale_ti-et.js
+++ b/src/ngLocale/angular-locale_ti-et.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u12d3\u122d\u1262",
       "\u1240\u12f3\u121d"
     ],
+    "ERANAMES": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
+    "ERAS": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u1303\u1295\u12e9\u12c8\u122a",
       "\u134c\u1265\u1229\u12c8\u122a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u1296\u126c\u121d",
       "\u12f2\u1234\u121d"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u1363 dd MMMM \u1218\u12d3\u120d\u1272 y G",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ti.js b/src/ngLocale/angular-locale_ti.js
index f1226ea7be43..872204c4afb0 100644
--- a/src/ngLocale/angular-locale_ti.js
+++ b/src/ngLocale/angular-locale_ti.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u12d3\u122d\u1262",
       "\u1240\u12f3\u121d"
     ],
+    "ERANAMES": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
+    "ERAS": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u1303\u1295\u12e9\u12c8\u122a",
       "\u134c\u1265\u1229\u12c8\u122a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u1296\u126c\u121d",
       "\u12f2\u1234\u121d"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u1363 dd MMMM \u1218\u12d3\u120d\u1272 y G",
     "longDate": "dd MMMM y",
     "medium": "dd-MMM-y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_tl.js b/src/ngLocale/angular-locale_tl.js
index b75b23f12ff9..59b7a10d8176 100644
--- a/src/ngLocale/angular-locale_tl.js
+++ b/src/ngLocale/angular-locale_tl.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Biyernes",
       "Sabado"
     ],
+    "ERANAMES": [
+      "BC",
+      "AD"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Enero",
       "Pebrero",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nob",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_tn-bw.js b/src/ngLocale/angular-locale_tn-bw.js
index 1146f7259c89..bc05b8e0a010 100644
--- a/src/ngLocale/angular-locale_tn-bw.js
+++ b/src/ngLocale/angular-locale_tn-bw.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Labotlhano",
       "Matlhatso"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ferikgong",
       "Tlhakole",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Ngw",
       "Sed"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_tn-za.js b/src/ngLocale/angular-locale_tn-za.js
index 01b931ba01c8..cecb7eeb2631 100644
--- a/src/ngLocale/angular-locale_tn-za.js
+++ b/src/ngLocale/angular-locale_tn-za.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Labotlhano",
       "Matlhatso"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ferikgong",
       "Tlhakole",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Ngw",
       "Sed"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_tn.js b/src/ngLocale/angular-locale_tn.js
index 6b6161d3f068..f24955606637 100644
--- a/src/ngLocale/angular-locale_tn.js
+++ b/src/ngLocale/angular-locale_tn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Labotlhano",
       "Matlhatso"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Ferikgong",
       "Tlhakole",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Ngw",
       "Sed"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_to-to.js b/src/ngLocale/angular-locale_to-to.js
index 2ac8b1c8b5d1..568ba879b70d 100644
--- a/src/ngLocale/angular-locale_to-to.js
+++ b/src/ngLocale/angular-locale_to-to.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Falaite",
       "Tokonaki"
     ],
+    "ERANAMES": [
+      "ki mu\u02bba",
+      "ta\u02bbu \u02bbo S\u012bs\u016b"
+    ],
+    "ERAS": [
+      "KM",
+      "TS"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "S\u0101nuali",
       "F\u0113pueli",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "N\u014dv",
       "T\u012bs"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_to.js b/src/ngLocale/angular-locale_to.js
index 7f19185ef83d..81ee57580b53 100644
--- a/src/ngLocale/angular-locale_to.js
+++ b/src/ngLocale/angular-locale_to.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Falaite",
       "Tokonaki"
     ],
+    "ERANAMES": [
+      "ki mu\u02bba",
+      "ta\u02bbu \u02bbo S\u012bs\u016b"
+    ],
+    "ERAS": [
+      "KM",
+      "TS"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "S\u0101nuali",
       "F\u0113pueli",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "N\u014dv",
       "T\u012bs"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_tr-cy.js b/src/ngLocale/angular-locale_tr-cy.js
index a06782942a62..ea4847590c90 100644
--- a/src/ngLocale/angular-locale_tr-cy.js
+++ b/src/ngLocale/angular-locale_tr-cy.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Cuma",
       "Cumartesi"
     ],
+    "ERANAMES": [
+      "Milattan \u00d6nce",
+      "Milattan Sonra"
+    ],
+    "ERAS": [
+      "M\u00d6",
+      "MS"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ocak",
       "\u015eubat",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Kas",
       "Ara"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "d MMMM y EEEE",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_tr-tr.js b/src/ngLocale/angular-locale_tr-tr.js
index 5f08553b5f48..e9575d34e3d5 100644
--- a/src/ngLocale/angular-locale_tr-tr.js
+++ b/src/ngLocale/angular-locale_tr-tr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Cuma",
       "Cumartesi"
     ],
+    "ERANAMES": [
+      "Milattan \u00d6nce",
+      "Milattan Sonra"
+    ],
+    "ERAS": [
+      "M\u00d6",
+      "MS"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ocak",
       "\u015eubat",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Kas",
       "Ara"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "d MMMM y EEEE",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_tr.js b/src/ngLocale/angular-locale_tr.js
index 64f22d30b56d..e3521251855e 100644
--- a/src/ngLocale/angular-locale_tr.js
+++ b/src/ngLocale/angular-locale_tr.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Cuma",
       "Cumartesi"
     ],
+    "ERANAMES": [
+      "Milattan \u00d6nce",
+      "Milattan Sonra"
+    ],
+    "ERAS": [
+      "M\u00d6",
+      "MS"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Ocak",
       "\u015eubat",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Kas",
       "Ara"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "d MMMM y EEEE",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ts-za.js b/src/ngLocale/angular-locale_ts-za.js
index 403e95403d95..077c4a587de7 100644
--- a/src/ngLocale/angular-locale_ts-za.js
+++ b/src/ngLocale/angular-locale_ts-za.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ravuntlhanu",
       "Mugqivela"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Sunguti",
       "Nyenyenyani",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Huk",
       "N\u2019w"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ts.js b/src/ngLocale/angular-locale_ts.js
index 8f3004d7076e..e5299089e3d8 100644
--- a/src/ngLocale/angular-locale_ts.js
+++ b/src/ngLocale/angular-locale_ts.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ravuntlhanu",
       "Mugqivela"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Sunguti",
       "Nyenyenyani",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Huk",
       "N\u2019w"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_twq-ne.js b/src/ngLocale/angular-locale_twq-ne.js
index bb501fedbc3b..6213c47e83e6 100644
--- a/src/ngLocale/angular-locale_twq-ne.js
+++ b/src/ngLocale/angular-locale_twq-ne.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Alzuma",
       "Asibti"
     ],
+    "ERANAMES": [
+      "Isaa jine",
+      "Isaa zamanoo"
+    ],
+    "ERAS": [
+      "IJ",
+      "IZ"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u017danwiye",
       "Feewiriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Noo",
       "Dee"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_twq.js b/src/ngLocale/angular-locale_twq.js
index 138ab3dd5cd8..b477674ab6d9 100644
--- a/src/ngLocale/angular-locale_twq.js
+++ b/src/ngLocale/angular-locale_twq.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Alzuma",
       "Asibti"
     ],
+    "ERANAMES": [
+      "Isaa jine",
+      "Isaa zamanoo"
+    ],
+    "ERAS": [
+      "IJ",
+      "IZ"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u017danwiye",
       "Feewiriye",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Noo",
       "Dee"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_tzm-latn-ma.js b/src/ngLocale/angular-locale_tzm-latn-ma.js
index 8dfc8d073af3..bbfe0a7ebe45 100644
--- a/src/ngLocale/angular-locale_tzm-latn-ma.js
+++ b/src/ngLocale/angular-locale_tzm-latn-ma.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Asimwas",
       "Asi\u1e0dyas"
     ],
+    "ERANAMES": [
+      "Zdat \u0190isa (TA\u0194)",
+      "\u1e0ceffir \u0190isa (TA\u0194)"
+    ],
+    "ERAS": [
+      "Z\u0190",
+      "\u1e0c\u0190"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "Yennayer",
       "Yebrayer",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nwa",
       "Duj"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_tzm-latn.js b/src/ngLocale/angular-locale_tzm-latn.js
index e066b0ea7d49..b17a71dc0fd7 100644
--- a/src/ngLocale/angular-locale_tzm-latn.js
+++ b/src/ngLocale/angular-locale_tzm-latn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Asimwas",
       "Asi\u1e0dyas"
     ],
+    "ERANAMES": [
+      "Zdat \u0190isa (TA\u0194)",
+      "\u1e0ceffir \u0190isa (TA\u0194)"
+    ],
+    "ERAS": [
+      "Z\u0190",
+      "\u1e0c\u0190"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "Yennayer",
       "Yebrayer",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nwa",
       "Duj"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "dh",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": "\u00a0",
     "PATTERNS": [
diff --git a/src/ngLocale/angular-locale_tzm.js b/src/ngLocale/angular-locale_tzm.js
index 4151e96a3df4..a2f34ff5fa15 100644
--- a/src/ngLocale/angular-locale_tzm.js
+++ b/src/ngLocale/angular-locale_tzm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Asimwas",
       "Asi\u1e0dyas"
     ],
+    "ERANAMES": [
+      "Zdat \u0190isa (TA\u0194)",
+      "\u1e0ceffir \u0190isa (TA\u0194)"
+    ],
+    "ERAS": [
+      "Z\u0190",
+      "\u1e0c\u0190"
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "Yennayer",
       "Yebrayer",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nwa",
       "Duj"
     ],
+    "WEEKENDRANGE": [
+      4,
+      5
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_ug-arab-cn.js b/src/ngLocale/angular-locale_ug-arab-cn.js
index 2cf85f449e8e..67092f1e3997 100644
--- a/src/ngLocale/angular-locale_ug-arab-cn.js
+++ b/src/ngLocale/angular-locale_ug-arab-cn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u06c8\u0645\u06d5",
       "\u0634\u06d5\u0646\u0628\u06d5"
     ],
+    "ERANAMES": [
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5\u062f\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646",
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5"
+    ],
+    "ERAS": [
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5\u062f\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646",
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u064a\u0627\u0646\u06cb\u0627\u0631",
       "\u0641\u06d0\u06cb\u0631\u0627\u0644",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u064a\u0627\u0628\u0649\u0631",
       "\u062f\u06d0\u0643\u0627\u0628\u0649\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c MMMM d\u060c y",
     "longDate": "MMMM d\u060c y",
     "medium": "MMM d\u060c y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ug-arab.js b/src/ngLocale/angular-locale_ug-arab.js
index da02c7a511f7..bd9ae4abd404 100644
--- a/src/ngLocale/angular-locale_ug-arab.js
+++ b/src/ngLocale/angular-locale_ug-arab.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u06c8\u0645\u06d5",
       "\u0634\u06d5\u0646\u0628\u06d5"
     ],
+    "ERANAMES": [
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5\u062f\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646",
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5"
+    ],
+    "ERAS": [
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5\u062f\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646",
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u064a\u0627\u0646\u06cb\u0627\u0631",
       "\u0641\u06d0\u06cb\u0631\u0627\u0644",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u064a\u0627\u0628\u0649\u0631",
       "\u062f\u06d0\u0643\u0627\u0628\u0649\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c MMMM d\u060c y",
     "longDate": "MMMM d\u060c y",
     "medium": "MMM d\u060c y h:mm:ss a",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "\u00a5",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ug.js b/src/ngLocale/angular-locale_ug.js
index b651808e0f14..2ed49abcf770 100644
--- a/src/ngLocale/angular-locale_ug.js
+++ b/src/ngLocale/angular-locale_ug.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u06c8\u0645\u06d5",
       "\u0634\u06d5\u0646\u0628\u06d5"
     ],
+    "ERANAMES": [
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5\u062f\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646",
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5"
+    ],
+    "ERAS": [
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5\u062f\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646",
+      "\u0645\u0649\u0644\u0627\u062f\u0649\u064a\u06d5"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u064a\u0627\u0646\u06cb\u0627\u0631",
       "\u0641\u06d0\u06cb\u0631\u0627\u0644",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u064a\u0627\u0628\u0649\u0631",
       "\u062f\u06d0\u0643\u0627\u0628\u0649\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c MMMM d\u060c y",
     "longDate": "MMMM d\u060c y",
     "medium": "MMM d\u060c y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_uk-ua.js b/src/ngLocale/angular-locale_uk-ua.js
index 8e7d535b9993..1fca063b0443 100644
--- a/src/ngLocale/angular-locale_uk-ua.js
+++ b/src/ngLocale/angular-locale_uk-ua.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u02bc\u044f\u0442\u043d\u0438\u0446\u044f",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d\u0430\u0448\u043e\u0457 \u0435\u0440\u0438",
+      "\u043d\u0430\u0448\u043e\u0457 \u0435\u0440\u0438"
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d.\u0435.",
+      "\u043d.\u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0441\u0456\u0447\u043d\u044f",
       "\u043b\u044e\u0442\u043e\u0433\u043e",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043b\u0438\u0441\u0442.",
       "\u0433\u0440\u0443\u0434."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0440'.",
     "longDate": "d MMMM y '\u0440'.",
     "medium": "d MMM y '\u0440'. HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_uk.js b/src/ngLocale/angular-locale_uk.js
index 28d5496f0c44..9519ad862e53 100644
--- a/src/ngLocale/angular-locale_uk.js
+++ b/src/ngLocale/angular-locale_uk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u043f\u02bc\u044f\u0442\u043d\u0438\u0446\u044f",
       "\u0441\u0443\u0431\u043e\u0442\u0430"
     ],
+    "ERANAMES": [
+      "\u0434\u043e \u043d\u0430\u0448\u043e\u0457 \u0435\u0440\u0438",
+      "\u043d\u0430\u0448\u043e\u0457 \u0435\u0440\u0438"
+    ],
+    "ERAS": [
+      "\u0434\u043e \u043d.\u0435.",
+      "\u043d.\u0435."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u0441\u0456\u0447\u043d\u044f",
       "\u043b\u044e\u0442\u043e\u0433\u043e",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u043b\u0438\u0441\u0442.",
       "\u0433\u0440\u0443\u0434."
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y '\u0440'.",
     "longDate": "d MMMM y '\u0440'.",
     "medium": "d MMM y '\u0440'. HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ur-in.js b/src/ngLocale/angular-locale_ur-in.js
index 7c5696169107..c81b2df109ac 100644
--- a/src/ngLocale/angular-locale_ur-in.js
+++ b/src/ngLocale/angular-locale_ur-in.js
@@ -27,13 +27,22 @@ $provide.value("$locale", {
     ],
     "DAY": [
       "\u0627\u062a\u0648\u0627\u0631",
-      "\u067e\u06cc\u0631",
+      "\u0633\u0648\u0645\u0648\u0627\u0631",
       "\u0645\u0646\u06af\u0644",
       "\u0628\u062f\u06be",
       "\u062c\u0645\u0639\u0631\u0627\u062a",
       "\u062c\u0645\u0639\u06c1",
       "\u06c1\u0641\u062a\u06c1"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0645\u0633\u06cc\u062d",
+      "\u0639\u06cc\u0633\u0648\u06cc"
+    ],
+    "ERAS": [
+      "\u0642\u0628\u0644 \u0645\u0633\u06cc\u062d",
+      "\u0639\u06cc\u0633\u0648\u06cc"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u06cc",
       "\u0641\u0631\u0648\u0631\u06cc",
@@ -50,7 +59,7 @@ $provide.value("$locale", {
     ],
     "SHORTDAY": [
       "\u0627\u062a\u0648\u0627\u0631",
-      "\u067e\u06cc\u0631",
+      "\u0633\u0648\u0645\u0648\u0627\u0631",
       "\u0645\u0646\u06af\u0644",
       "\u0628\u062f\u06be",
       "\u062c\u0645\u0639\u0631\u0627\u062a",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      6,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "d MMM\u060c y h:mm:ss a",
@@ -86,7 +99,7 @@ $provide.value("$locale", {
     "GROUP_SEP": ",",
     "PATTERNS": [
       {
-        "gSize": 2,
+        "gSize": 3,
         "lgSize": 3,
         "maxFrac": 3,
         "minFrac": 0,
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ur-pk.js b/src/ngLocale/angular-locale_ur-pk.js
index cd5fe1997254..f64e8f6096fa 100644
--- a/src/ngLocale/angular-locale_ur-pk.js
+++ b/src/ngLocale/angular-locale_ur-pk.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u06c1",
       "\u06c1\u0641\u062a\u06c1"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0645\u0633\u06cc\u062d",
+      "\u0639\u06cc\u0633\u0648\u06cc \u0633\u0646"
+    ],
+    "ERAS": [
+      "\u0642 \u0645",
+      "\u0639\u06cc\u0633\u0648\u06cc \u0633\u0646"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u06cc",
       "\u0641\u0631\u0648\u0631\u06cc",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "d MMM\u060c y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ur.js b/src/ngLocale/angular-locale_ur.js
index f578c9536c11..79bf686cac5b 100644
--- a/src/ngLocale/angular-locale_ur.js
+++ b/src/ngLocale/angular-locale_ur.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u06c1",
       "\u06c1\u0641\u062a\u06c1"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0645\u0633\u06cc\u062d",
+      "\u0639\u06cc\u0633\u0648\u06cc \u0633\u0646"
+    ],
+    "ERAS": [
+      "\u0642 \u0645",
+      "\u0639\u06cc\u0633\u0648\u06cc \u0633\u0646"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u06cc",
       "\u0641\u0631\u0648\u0631\u06cc",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645\u0628\u0631",
       "\u062f\u0633\u0645\u0628\u0631"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE\u060c d MMMM\u060c y",
     "longDate": "d MMMM\u060c y",
     "medium": "d MMM\u060c y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_uz-arab-af.js b/src/ngLocale/angular-locale_uz-arab-af.js
index 78fbc8ceff08..118132ae5e8c 100644
--- a/src/ngLocale/angular-locale_uz-arab-af.js
+++ b/src/ngLocale/angular-locale_uz-arab-af.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u0647",
       "\u0634\u0646\u0628\u0647"
     ],
+    "ERANAMES": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "ERAS": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u06cc",
       "\u0641\u0628\u0631\u0648\u0631\u06cc",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645",
       "\u062f\u0633\u0645"
     ],
+    "WEEKENDRANGE": [
+      3,
+      4
+    ],
     "fullDate": "y \u0646\u0686\u06cc \u06cc\u06cc\u0644 d \u0646\u0686\u06cc MMMM EEEE \u06a9\u0648\u0646\u06cc",
     "longDate": "d \u0646\u0686\u06cc MMMM y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_uz-arab.js b/src/ngLocale/angular-locale_uz-arab.js
index abb1a192c7c8..3f1a20da4fba 100644
--- a/src/ngLocale/angular-locale_uz-arab.js
+++ b/src/ngLocale/angular-locale_uz-arab.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u062c\u0645\u0639\u0647",
       "\u0634\u0646\u0628\u0647"
     ],
+    "ERANAMES": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "ERAS": [
+      "\u0642.\u0645.",
+      "\u0645."
+    ],
+    "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u062c\u0646\u0648\u0631\u06cc",
       "\u0641\u0628\u0631\u0648\u0631\u06cc",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u0646\u0648\u0645",
       "\u062f\u0633\u0645"
     ],
+    "WEEKENDRANGE": [
+      3,
+      4
+    ],
     "fullDate": "y \u0646\u0686\u06cc \u06cc\u06cc\u0644 d \u0646\u0686\u06cc MMMM EEEE \u06a9\u0648\u0646\u06cc",
     "longDate": "d \u0646\u0686\u06cc MMMM y",
     "medium": "d MMM y H:mm:ss",
diff --git a/src/ngLocale/angular-locale_uz-cyrl-uz.js b/src/ngLocale/angular-locale_uz-cyrl-uz.js
index e8eddda7dadd..03e74ba69a5c 100644
--- a/src/ngLocale/angular-locale_uz-cyrl-uz.js
+++ b/src/ngLocale/angular-locale_uz-cyrl-uz.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0436\u0443\u043c\u0430",
       "\u0448\u0430\u043d\u0431\u0430"
     ],
+    "ERANAMES": [
+      "\u041c.\u0410.",
+      "\u042d"
+    ],
+    "ERAS": [
+      "\u041c.\u0410.",
+      "\u042d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u042f\u043d\u0432\u0430\u0440",
       "\u0424\u0435\u0432\u0440\u0430\u043b",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u041d\u043e\u044f",
       "\u0414\u0435\u043a"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_uz-cyrl.js b/src/ngLocale/angular-locale_uz-cyrl.js
index 19aae61b12a6..d284657c077d 100644
--- a/src/ngLocale/angular-locale_uz-cyrl.js
+++ b/src/ngLocale/angular-locale_uz-cyrl.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u0436\u0443\u043c\u0430",
       "\u0448\u0430\u043d\u0431\u0430"
     ],
+    "ERANAMES": [
+      "\u041c.\u0410.",
+      "\u042d"
+    ],
+    "ERAS": [
+      "\u041c.\u0410.",
+      "\u042d"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u042f\u043d\u0432\u0430\u0440",
       "\u0424\u0435\u0432\u0440\u0430\u043b",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "\u041d\u043e\u044f",
       "\u0414\u0435\u043a"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "so\u02bcm",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": "\u00a0",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_uz-latn-uz.js b/src/ngLocale/angular-locale_uz-latn-uz.js
index 28fef942a5d9..d7b41bd0fb88 100644
--- a/src/ngLocale/angular-locale_uz-latn-uz.js
+++ b/src/ngLocale/angular-locale_uz-latn-uz.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "juma",
       "shanba"
     ],
+    "ERANAMES": [
+      "M.A.",
+      "E"
+    ],
+    "ERAS": [
+      "M.A.",
+      "E"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Yanvar",
       "Fevral",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Noya",
       "Dek"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_uz-latn.js b/src/ngLocale/angular-locale_uz-latn.js
index bc73e92b4cc4..a02622714f81 100644
--- a/src/ngLocale/angular-locale_uz-latn.js
+++ b/src/ngLocale/angular-locale_uz-latn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "juma",
       "shanba"
     ],
+    "ERANAMES": [
+      "M.A.",
+      "E"
+    ],
+    "ERAS": [
+      "M.A.",
+      "E"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Yanvar",
       "Fevral",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Noya",
       "Dek"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "HH:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "so\u02bcm",
     "DECIMAL_SEP": ",",
     "GROUP_SEP": "\u00a0",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_uz.js b/src/ngLocale/angular-locale_uz.js
index 2e57664c767d..1bf9a64524c7 100644
--- a/src/ngLocale/angular-locale_uz.js
+++ b/src/ngLocale/angular-locale_uz.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "juma",
       "shanba"
     ],
+    "ERANAMES": [
+      "M.A.",
+      "E"
+    ],
+    "ERAS": [
+      "M.A.",
+      "E"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Yanvar",
       "Fevral",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Noya",
       "Dek"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, y MMMM dd",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_vai-latn-lr.js b/src/ngLocale/angular-locale_vai-latn-lr.js
index d84559d47fac..a3d63c35b0f3 100644
--- a/src/ngLocale/angular-locale_vai-latn-lr.js
+++ b/src/ngLocale/angular-locale_vai-latn-lr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "aijima",
       "si\u0253iti"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "luukao kem\u00e3",
       "\u0253anda\u0253u",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "kenpkato \u0253olol\u0254",
       "luukao l\u0254ma"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_vai-latn.js b/src/ngLocale/angular-locale_vai-latn.js
index 65127b04d390..3afe6629b868 100644
--- a/src/ngLocale/angular-locale_vai-latn.js
+++ b/src/ngLocale/angular-locale_vai-latn.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "aijima",
       "si\u0253iti"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "luukao kem\u00e3",
       "\u0253anda\u0253u",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "kenpkato \u0253olol\u0254",
       "luukao l\u0254ma"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "$",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_vai-vaii-lr.js b/src/ngLocale/angular-locale_vai-vaii-lr.js
index 7a1b994d678b..6666694983a9 100644
--- a/src/ngLocale/angular-locale_vai-vaii-lr.js
+++ b/src/ngLocale/angular-locale_vai-vaii-lr.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\ua549\ua524\ua540\ua56e",
       "\ua53b\ua52c\ua533"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\ua5a8\ua56a\ua583 \ua51e\ua56e",
       "\ua552\ua561\ua59d\ua595",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\ua51e\ua60b\ua554\ua57f \ua578\ua583\ua5cf",
       "\ua5a8\ua56a\ua571 \ua5cf\ua56e"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_vai-vaii.js b/src/ngLocale/angular-locale_vai-vaii.js
index 632168549747..fc172f820231 100644
--- a/src/ngLocale/angular-locale_vai-vaii.js
+++ b/src/ngLocale/angular-locale_vai-vaii.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\ua549\ua524\ua540\ua56e",
       "\ua53b\ua52c\ua533"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\ua5a8\ua56a\ua583 \ua51e\ua56e",
       "\ua552\ua561\ua59d\ua595",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\ua51e\ua60b\ua554\ua57f \ua578\ua583\ua5cf",
       "\ua5a8\ua56a\ua571 \ua5cf\ua56e"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -81,7 +94,7 @@ $provide.value("$locale", {
     "shortTime": "h:mm a"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "$",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_vai.js b/src/ngLocale/angular-locale_vai.js
index 473577be7a81..bdf3393a2b90 100644
--- a/src/ngLocale/angular-locale_vai.js
+++ b/src/ngLocale/angular-locale_vai.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\ua549\ua524\ua540\ua56e",
       "\ua53b\ua52c\ua533"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\ua5a8\ua56a\ua583 \ua51e\ua56e",
       "\ua552\ua561\ua59d\ua595",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\ua51e\ua60b\ua554\ua57f \ua578\ua583\ua5cf",
       "\ua5a8\ua56a\ua571 \ua5cf\ua56e"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_ve-za.js b/src/ngLocale/angular-locale_ve-za.js
index 209d496e6f78..eb526307cbfc 100644
--- a/src/ngLocale/angular-locale_ve-za.js
+++ b/src/ngLocale/angular-locale_ve-za.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u1e3cavhu\u1e71anu",
       "Mugivhela"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Phando",
       "Luhuhi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u1e3car",
       "Nye"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_ve.js b/src/ngLocale/angular-locale_ve.js
index 881c4cf57c32..0acd86f14c26 100644
--- a/src/ngLocale/angular-locale_ve.js
+++ b/src/ngLocale/angular-locale_ve.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u1e3cavhu\u1e71anu",
       "Mugivhela"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Phando",
       "Luhuhi",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u1e3car",
       "Nye"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMM d, EEEE",
     "longDate": "y MMMM d",
     "medium": "y MMM d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_vi-vn.js b/src/ngLocale/angular-locale_vi-vn.js
index 1576bafd4086..112e96ae9818 100644
--- a/src/ngLocale/angular-locale_vi-vn.js
+++ b/src/ngLocale/angular-locale_vi-vn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Th\u1ee9 S\u00e1u",
       "Th\u1ee9 B\u1ea3y"
     ],
+    "ERANAMES": [
+      "tr. CN",
+      "sau CN"
+    ],
+    "ERAS": [
+      "tr. CN",
+      "sau CN"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "th\u00e1ng 1",
       "th\u00e1ng 2",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "thg 11",
       "thg 12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y",
     "longDate": "'Ng\u00e0y' dd 'th\u00e1ng' MM 'n\u0103m' y",
     "medium": "dd-MM-y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_vi.js b/src/ngLocale/angular-locale_vi.js
index bd1151b4c837..be70bd8eb28e 100644
--- a/src/ngLocale/angular-locale_vi.js
+++ b/src/ngLocale/angular-locale_vi.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Th\u1ee9 S\u00e1u",
       "Th\u1ee9 B\u1ea3y"
     ],
+    "ERANAMES": [
+      "tr. CN",
+      "sau CN"
+    ],
+    "ERAS": [
+      "tr. CN",
+      "sau CN"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "th\u00e1ng 1",
       "th\u00e1ng 2",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "thg 11",
       "thg 12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y",
     "longDate": "'Ng\u00e0y' dd 'th\u00e1ng' MM 'n\u0103m' y",
     "medium": "dd-MM-y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_vo-001.js b/src/ngLocale/angular-locale_vo-001.js
index 05e7310c4972..a17a26dac1a6 100644
--- a/src/ngLocale/angular-locale_vo-001.js
+++ b/src/ngLocale/angular-locale_vo-001.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fridel",
       "z\u00e4del"
     ],
+    "ERANAMES": [
+      "b. t. kr.",
+      "p. t. kr."
+    ],
+    "ERAS": [
+      "b. t. kr.",
+      "p. t. kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janul",
       "febul",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dek"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMMa 'd'. d'id'",
     "longDate": "y MMMM d",
     "medium": "y MMM. d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_vo.js b/src/ngLocale/angular-locale_vo.js
index 07eec8514ea9..f85079931d18 100644
--- a/src/ngLocale/angular-locale_vo.js
+++ b/src/ngLocale/angular-locale_vo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fridel",
       "z\u00e4del"
     ],
+    "ERANAMES": [
+      "b. t. kr.",
+      "p. t. kr."
+    ],
+    "ERAS": [
+      "b. t. kr.",
+      "p. t. kr."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "janul",
       "febul",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "nov",
       "dek"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y MMMMa 'd'. d'id'",
     "longDate": "y MMMM d",
     "medium": "y MMM. d HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_vun-tz.js b/src/ngLocale/angular-locale_vun-tz.js
index 9e0f9f64ac45..52b0670ee759 100644
--- a/src/ngLocale/angular-locale_vun-tz.js
+++ b/src/ngLocale/angular-locale_vun-tz.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristu",
+      "Baada ya Kristu"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_vun.js b/src/ngLocale/angular-locale_vun.js
index 8af7ca3ecb0b..4efacdf09b6d 100644
--- a/src/ngLocale/angular-locale_vun.js
+++ b/src/ngLocale/angular-locale_vun.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Ijumaa",
       "Jumamosi"
     ],
+    "ERANAMES": [
+      "Kabla ya Kristu",
+      "Baada ya Kristu"
+    ],
+    "ERAS": [
+      "KK",
+      "BK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januari",
       "Februari",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_wae-ch.js b/src/ngLocale/angular-locale_wae-ch.js
index 0621a676b5c1..fba5d6ffba80 100644
--- a/src/ngLocale/angular-locale_wae-ch.js
+++ b/src/ngLocale/angular-locale_wae-ch.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Fritag",
       "Sam\u0161tag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr"
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Jenner",
       "Hornig",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Win",
       "Chr"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_wae.js b/src/ngLocale/angular-locale_wae.js
index 4037b7989744..0e16d9163f48 100644
--- a/src/ngLocale/angular-locale_wae.js
+++ b/src/ngLocale/angular-locale_wae.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Fritag",
       "Sam\u0161tag"
     ],
+    "ERANAMES": [
+      "v. Chr.",
+      "n. Chr"
+    ],
+    "ERAS": [
+      "v. Chr.",
+      "n. Chr"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Jenner",
       "Hornig",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Win",
       "Chr"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d. MMMM y",
     "longDate": "d. MMMM y",
     "medium": "d. MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_xog-ug.js b/src/ngLocale/angular-locale_xog-ug.js
index 0848d0910a73..0288518ee545 100644
--- a/src/ngLocale/angular-locale_xog-ug.js
+++ b/src/ngLocale/angular-locale_xog-ug.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Olokutaanu",
       "Olomukaaga"
     ],
+    "ERANAMES": [
+      "Kulisto nga azilawo",
+      "Kulisto nga affile"
+    ],
+    "ERAS": [
+      "AZ",
+      "AF"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janwaliyo",
       "Febwaliyo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_xog.js b/src/ngLocale/angular-locale_xog.js
index b3cb166bc59e..1a42ccf007c7 100644
--- a/src/ngLocale/angular-locale_xog.js
+++ b/src/ngLocale/angular-locale_xog.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "Olokutaanu",
       "Olomukaaga"
     ],
+    "ERANAMES": [
+      "Kulisto nga azilawo",
+      "Kulisto nga affile"
+    ],
+    "ERAS": [
+      "AZ",
+      "AF"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Janwaliyo",
       "Febwaliyo",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "Nov",
       "Des"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
diff --git a/src/ngLocale/angular-locale_yav-cm.js b/src/ngLocale/angular-locale_yav-cm.js
index 24bb21cb1963..142164fcdd2b 100644
--- a/src/ngLocale/angular-locale_yav-cm.js
+++ b/src/ngLocale/angular-locale_yav-cm.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fel\u00e9te",
       "s\u00e9sel\u00e9"
     ],
+    "ERANAMES": [
+      "katikup\u00eden Y\u00e9suse",
+      "\u00e9k\u00e9l\u00e9mk\u00fanup\u00ed\u00e9n n"
+    ],
+    "ERAS": [
+      "k.Y.",
+      "+J.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "pik\u00edt\u00edk\u00edtie, o\u00f3l\u00ed \u00fa kut\u00faan",
       "si\u025by\u025b\u0301, o\u00f3li \u00fa k\u00e1nd\u00ed\u025b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "o.11",
       "o.12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_yav.js b/src/ngLocale/angular-locale_yav.js
index 74f4692adabb..01781a0d2361 100644
--- a/src/ngLocale/angular-locale_yav.js
+++ b/src/ngLocale/angular-locale_yav.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "fel\u00e9te",
       "s\u00e9sel\u00e9"
     ],
+    "ERANAMES": [
+      "katikup\u00eden Y\u00e9suse",
+      "\u00e9k\u00e9l\u00e9mk\u00fanup\u00ed\u00e9n n"
+    ],
+    "ERAS": [
+      "k.Y.",
+      "+J.C."
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "pik\u00edt\u00edk\u00edtie, o\u00f3l\u00ed \u00fa kut\u00faan",
       "si\u025by\u025b\u0301, o\u00f3li \u00fa k\u00e1nd\u00ed\u025b",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "o.11",
       "o.12"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_yi-001.js b/src/ngLocale/angular-locale_yi-001.js
index 22e8df730dd4..0ba2042d1355 100644
--- a/src/ngLocale/angular-locale_yi-001.js
+++ b/src/ngLocale/angular-locale_yi-001.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u05e4\u05bf\u05e8\u05f2\u05b7\u05d8\u05d9\u05e7",
       "\u05e9\u05d1\u05ea"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u05d9\u05d0\u05b7\u05e0\u05d5\u05d0\u05b7\u05e8",
       "\u05e4\u05bf\u05e2\u05d1\u05e8\u05d5\u05d0\u05b7\u05e8",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u05e0\u05d0\u05d5\u05d5\u05e2\u05de\u05d1\u05e2\u05e8",
       "\u05d3\u05e2\u05e6\u05e2\u05de\u05d1\u05e2\u05e8"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d\u05d8\u05df MMMM y",
     "longDate": "d\u05d8\u05df MMMM y",
     "medium": "d\u05d8\u05df MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_yi.js b/src/ngLocale/angular-locale_yi.js
index 6598e95bbc83..57fb4a9d11f4 100644
--- a/src/ngLocale/angular-locale_yi.js
+++ b/src/ngLocale/angular-locale_yi.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u05e4\u05bf\u05e8\u05f2\u05b7\u05d8\u05d9\u05e7",
       "\u05e9\u05d1\u05ea"
     ],
+    "ERANAMES": [
+      "BCE",
+      "CE"
+    ],
+    "ERAS": [
+      "BCE",
+      "CE"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u05d9\u05d0\u05b7\u05e0\u05d5\u05d0\u05b7\u05e8",
       "\u05e4\u05bf\u05e2\u05d1\u05e8\u05d5\u05d0\u05b7\u05e8",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u05e0\u05d0\u05d5\u05d5\u05e2\u05de\u05d1\u05e2\u05e8",
       "\u05d3\u05e2\u05e6\u05e2\u05de\u05d1\u05e2\u05e8"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d\u05d8\u05df MMMM y",
     "longDate": "d\u05d8\u05df MMMM y",
     "medium": "d\u05d8\u05df MMM y HH:mm:ss",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_yo-bj.js b/src/ngLocale/angular-locale_yo-bj.js
index 4fd8277a71cf..afc112c32a43 100644
--- a/src/ngLocale/angular-locale_yo-bj.js
+++ b/src/ngLocale/angular-locale_yo-bj.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u0186j\u0254\u0301 \u0190t\u00ec",
       "\u0186j\u0254\u0301 \u00c0b\u00e1m\u025b\u0301ta"
     ],
+    "ERANAMES": [
+      "Saju Kristi",
+      "Lehin Kristi"
+    ],
+    "ERAS": [
+      "SK",
+      "LK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Osh\u00f9 Sh\u025b\u0301r\u025b\u0301",
       "Osh\u00f9 \u00c8r\u00e8l\u00e8",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "B\u00e9l\u00fa",
       "\u0186\u0300p\u025b\u0300"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_yo-ng.js b/src/ngLocale/angular-locale_yo-ng.js
index 0dcd5ae3ee4e..37b44503be6b 100644
--- a/src/ngLocale/angular-locale_yo-ng.js
+++ b/src/ngLocale/angular-locale_yo-ng.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u1eccj\u1ecd\u0301 \u1eb8t\u00ec",
       "\u1eccj\u1ecd\u0301 \u00c0b\u00e1m\u1eb9\u0301ta"
     ],
+    "ERANAMES": [
+      "Saju Kristi",
+      "Lehin Kristi"
+    ],
+    "ERAS": [
+      "SK",
+      "LK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "O\u1e63\u00f9 \u1e62\u1eb9\u0301r\u1eb9\u0301",
       "O\u1e63\u00f9 \u00c8r\u00e8l\u00e8",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "B\u00e9l\u00fa",
       "\u1ecc\u0300p\u1eb9\u0300"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_yo.js b/src/ngLocale/angular-locale_yo.js
index 4b5b5840ec91..49d87d4fb93a 100644
--- a/src/ngLocale/angular-locale_yo.js
+++ b/src/ngLocale/angular-locale_yo.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u1eccj\u1ecd\u0301 \u1eb8t\u00ec",
       "\u1eccj\u1ecd\u0301 \u00c0b\u00e1m\u1eb9\u0301ta"
     ],
+    "ERANAMES": [
+      "Saju Kristi",
+      "Lehin Kristi"
+    ],
+    "ERAS": [
+      "SK",
+      "LK"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "O\u1e63\u00f9 \u1e62\u1eb9\u0301r\u1eb9\u0301",
       "O\u1e63\u00f9 \u00c8r\u00e8l\u00e8",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "B\u00e9l\u00fa",
       "\u1ecc\u0300p\u1eb9\u0300"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM y h:mm:ss a",
@@ -102,7 +115,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zgh-ma.js b/src/ngLocale/angular-locale_zgh-ma.js
index 1eb2b76fc0ac..ec0c86b1de2c 100644
--- a/src/ngLocale/angular-locale_zgh-ma.js
+++ b/src/ngLocale/angular-locale_zgh-ma.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u2d30\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59",
       "\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59"
     ],
+    "ERANAMES": [
+      "\u2d37\u2d30\u2d5c \u2d4f \u2d44\u2d49\u2d59\u2d30",
+      "\u2d37\u2d3c\u2d3c\u2d49\u2d54 \u2d4f \u2d44\u2d49\u2d59\u2d30"
+    ],
+    "ERAS": [
+      "\u2d37\u2d30\u2d44",
+      "\u2d37\u2d3c\u2d44"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54",
       "\u2d31\u2d55\u2d30\u2d62\u2d55",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u2d4f\u2d53\u2d61",
       "\u2d37\u2d53\u2d4a"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_zgh.js b/src/ngLocale/angular-locale_zgh.js
index f89c5318bb55..c4c7a64e4069 100644
--- a/src/ngLocale/angular-locale_zgh.js
+++ b/src/ngLocale/angular-locale_zgh.js
@@ -34,6 +34,15 @@ $provide.value("$locale", {
       "\u2d30\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59",
       "\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59"
     ],
+    "ERANAMES": [
+      "\u2d37\u2d30\u2d5c \u2d4f \u2d44\u2d49\u2d59\u2d30",
+      "\u2d37\u2d3c\u2d3c\u2d49\u2d54 \u2d4f \u2d44\u2d49\u2d59\u2d30"
+    ],
+    "ERAS": [
+      "\u2d37\u2d30\u2d44",
+      "\u2d37\u2d3c\u2d44"
+    ],
+    "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54",
       "\u2d31\u2d55\u2d30\u2d62\u2d55",
@@ -71,6 +80,10 @@ $provide.value("$locale", {
       "\u2d4f\u2d53\u2d61",
       "\u2d37\u2d53\u2d4a"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE d MMMM y",
     "longDate": "d MMMM y",
     "medium": "d MMM, y HH:mm:ss",
diff --git a/src/ngLocale/angular-locale_zh-cn.js b/src/ngLocale/angular-locale_zh-cn.js
index 9c8f324e19e3..d15cdd61e6e0 100644
--- a/src/ngLocale/angular-locale_zh-cn.js
+++ b/src/ngLocale/angular-locale_zh-cn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u4e00\u6708",
       "\u4e8c\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hans-cn.js b/src/ngLocale/angular-locale_zh-hans-cn.js
index 76af8ce90070..120aa83039ed 100644
--- a/src/ngLocale/angular-locale_zh-hans-cn.js
+++ b/src/ngLocale/angular-locale_zh-hans-cn.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u4e00\u6708",
       "\u4e8c\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hans-hk.js b/src/ngLocale/angular-locale_zh-hans-hk.js
index 80a0f15d427b..d47c48b129a6 100644
--- a/src/ngLocale/angular-locale_zh-hans-hk.js
+++ b/src/ngLocale/angular-locale_zh-hans-hk.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u4e00\u6708",
       "\u4e8c\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hans-mo.js b/src/ngLocale/angular-locale_zh-hans-mo.js
index 471af9ea1626..750fd37447f5 100644
--- a/src/ngLocale/angular-locale_zh-hans-mo.js
+++ b/src/ngLocale/angular-locale_zh-hans-mo.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u4e00\u6708",
       "\u4e8c\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hans-sg.js b/src/ngLocale/angular-locale_zh-hans-sg.js
index b7c100ed69be..329df2df8523 100644
--- a/src/ngLocale/angular-locale_zh-hans-sg.js
+++ b/src/ngLocale/angular-locale_zh-hans-sg.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u4e00\u6708",
       "\u4e8c\u6708",
@@ -53,14 +62,18 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
     "mediumDate": "y\u5e74M\u6708d\u65e5",
     "mediumTime": "ah:mm:ss",
-    "short": "dd/MM/yy ahh:mm",
+    "short": "dd/MM/yy ah:mm",
     "shortDate": "dd/MM/yy",
-    "shortTime": "ahh:mm"
+    "shortTime": "ah:mm"
   },
   "NUMBER_FORMATS": {
     "CURRENCY_SYM": "$",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hans.js b/src/ngLocale/angular-locale_zh-hans.js
index b44c7bd35c0c..920d39d06dfb 100644
--- a/src/ngLocale/angular-locale_zh-hans.js
+++ b/src/ngLocale/angular-locale_zh-hans.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u4e00\u6708",
       "\u4e8c\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -63,7 +76,7 @@ $provide.value("$locale", {
     "shortTime": "ah:mm"
   },
   "NUMBER_FORMATS": {
-    "CURRENCY_SYM": "\u20ac",
+    "CURRENCY_SYM": "\u00a5",
     "DECIMAL_SEP": ".",
     "GROUP_SEP": ",",
     "PATTERNS": [
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hant-hk.js b/src/ngLocale/angular-locale_zh-hant-hk.js
index 0ee3a4e99548..23d60d7c66e4 100644
--- a/src/ngLocale/angular-locale_zh-hant-hk.js
+++ b/src/ngLocale/angular-locale_zh-hant-hk.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\u6708",
       "2\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hant-mo.js b/src/ngLocale/angular-locale_zh-hant-mo.js
index 1bf87be2debb..a6e4a328bd3a 100644
--- a/src/ngLocale/angular-locale_zh-hant-mo.js
+++ b/src/ngLocale/angular-locale_zh-hant-mo.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\u6708",
       "2\u6708",
@@ -53,13 +62,17 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
-    "fullDate": "y\u5e74MM\u6708dd\u65e5EEEE",
-    "longDate": "y\u5e74MM\u6708dd\u65e5",
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
+    "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
     "mediumDate": "y\u5e74M\u6708d\u65e5",
     "mediumTime": "ah:mm:ss",
-    "short": "yy\u5e74M\u6708d\u65e5 ah:mm",
-    "shortDate": "yy\u5e74M\u6708d\u65e5",
+    "short": "d/M/yy ah:mm",
+    "shortDate": "d/M/yy",
     "shortTime": "ah:mm"
   },
   "NUMBER_FORMATS": {
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hant-tw.js b/src/ngLocale/angular-locale_zh-hant-tw.js
index f64f1d00baca..7caaa086b7c8 100644
--- a/src/ngLocale/angular-locale_zh-hant-tw.js
+++ b/src/ngLocale/angular-locale_zh-hant-tw.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u897f\u5143\u524d",
+      "\u897f\u5143"
+    ],
+    "ERAS": [
+      "\u897f\u5143\u524d",
+      "\u897f\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\u6708",
       "2\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5 EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hant.js b/src/ngLocale/angular-locale_zh-hant.js
index cf8957c83f6d..99b7e43d3efc 100644
--- a/src/ngLocale/angular-locale_zh-hant.js
+++ b/src/ngLocale/angular-locale_zh-hant.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u897f\u5143\u524d",
+      "\u897f\u5143"
+    ],
+    "ERAS": [
+      "\u897f\u5143\u524d",
+      "\u897f\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\u6708",
       "2\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5 EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-hk.js b/src/ngLocale/angular-locale_zh-hk.js
index 7eae844ad430..6c8fefb3a945 100644
--- a/src/ngLocale/angular-locale_zh-hk.js
+++ b/src/ngLocale/angular-locale_zh-hk.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\u6708",
       "2\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh-tw.js b/src/ngLocale/angular-locale_zh-tw.js
index d9eb9e12babc..b834a61731b0 100644
--- a/src/ngLocale/angular-locale_zh-tw.js
+++ b/src/ngLocale/angular-locale_zh-tw.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u897f\u5143\u524d",
+      "\u897f\u5143"
+    ],
+    "ERAS": [
+      "\u897f\u5143\u524d",
+      "\u897f\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "1\u6708",
       "2\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5 EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zh.js b/src/ngLocale/angular-locale_zh.js
index bcea795312ba..8c764a76f4cb 100644
--- a/src/ngLocale/angular-locale_zh.js
+++ b/src/ngLocale/angular-locale_zh.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "\u661f\u671f\u4e94",
       "\u661f\u671f\u516d"
     ],
+    "ERANAMES": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "ERAS": [
+      "\u516c\u5143\u524d",
+      "\u516c\u5143"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u4e00\u6708",
       "\u4e8c\u6708",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "11\u6708",
       "12\u6708"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "y\u5e74M\u6708d\u65e5EEEE",
     "longDate": "y\u5e74M\u6708d\u65e5",
     "medium": "y\u5e74M\u6708d\u65e5 ah:mm:ss",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4\u00a0-",
+        "negPre": "-\u00a4\u00a0",
         "negSuf": "",
         "posPre": "\u00a4\u00a0",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zu-za.js b/src/ngLocale/angular-locale_zu-za.js
index 6d76b3955c77..4f48a9fddd24 100644
--- a/src/ngLocale/angular-locale_zu-za.js
+++ b/src/ngLocale/angular-locale_zu-za.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Lwesihlanu",
       "Mgqibelo"
     ],
+    "ERANAMES": [
+      "BC",
+      "AD"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januwari",
       "Februwari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngLocale/angular-locale_zu.js b/src/ngLocale/angular-locale_zu.js
index 1ad6b0295cfc..bd4d00ecfb91 100644
--- a/src/ngLocale/angular-locale_zu.js
+++ b/src/ngLocale/angular-locale_zu.js
@@ -16,6 +16,15 @@ $provide.value("$locale", {
       "Lwesihlanu",
       "Mgqibelo"
     ],
+    "ERANAMES": [
+      "BC",
+      "AD"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januwari",
       "Februwari",
@@ -53,6 +62,10 @@ $provide.value("$locale", {
       "Nov",
       "Dis"
     ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
     "fullDate": "EEEE, MMMM d, y",
     "longDate": "MMMM d, y",
     "medium": "MMM d, y h:mm:ss a",
@@ -84,7 +97,7 @@ $provide.value("$locale", {
         "maxFrac": 2,
         "minFrac": 2,
         "minInt": 1,
-        "negPre": "\u00a4-",
+        "negPre": "-\u00a4",
         "negSuf": "",
         "posPre": "\u00a4",
         "posSuf": ""
diff --git a/src/ngMessageFormat/.jshintrc b/src/ngMessageFormat/.jshintrc
new file mode 100644
index 000000000000..a385fbf74a0b
--- /dev/null
+++ b/src/ngMessageFormat/.jshintrc
@@ -0,0 +1,8 @@
+{
+  "extends": "../../.jshintrc-base",
+  "browser": true,
+  "globals": {
+    "angular": false,
+    "goog": false // see src/module_closure.prefix
+  }
+}
diff --git a/src/ngMessageFormat/messageFormatCommon.js b/src/ngMessageFormat/messageFormatCommon.js
new file mode 100644
index 000000000000..19af9d30f208
--- /dev/null
+++ b/src/ngMessageFormat/messageFormatCommon.js
@@ -0,0 +1,77 @@
+'use strict';
+
+// NOTE: ADVANCED_OPTIMIZATIONS mode.
+//
+// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
+// constructs incompatible with that mode.
+
+var $interpolateMinErr = window['angular']['$interpolateMinErr'];
+
+var noop = window['angular']['noop'],
+    isFunction = window['angular']['isFunction'],
+    toJson = window['angular']['toJson'];
+
+function stringify(value) {
+  if (value == null /* null/undefined */) { return ''; }
+  switch (typeof value) {
+    case 'string':     return value;
+    case 'number':     return '' + value;
+    default:           return toJson(value);
+  }
+}
+
+// Convert an index into the string into line/column for use in error messages
+// As such, this doesn't have to be efficient.
+function indexToLineAndColumn(text, index) {
+  var lines = text.split(/\n/g);
+  for (var i=0; i < lines.length; i++) {
+    var line=lines[i];
+    if (index >= line.length) {
+      index -= line.length;
+    } else {
+      return { line: i + 1, column: index + 1 };
+    }
+  }
+}
+var PARSE_CACHE_FOR_TEXT_LITERALS = Object.create(null);
+
+function parseTextLiteral(text) {
+  var cachedFn = PARSE_CACHE_FOR_TEXT_LITERALS[text];
+  if (cachedFn != null) {
+    return cachedFn;
+  }
+  function parsedFn(context) { return text; }
+  parsedFn['$$watchDelegate'] = function watchDelegate(scope, listener, objectEquality) {
+    var unwatch = scope['$watch'](noop,
+        function textLiteralWatcher() {
+          if (isFunction(listener)) { listener.call(null, text, text, scope); }
+          unwatch();
+        },
+        objectEquality);
+    return unwatch;
+  };
+  PARSE_CACHE_FOR_TEXT_LITERALS[text] = parsedFn;
+  parsedFn['exp'] = text; // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
+  parsedFn['expressions'] = []; // Require this to call $compile.$$addBindingInfo() which allows Protractor to find elements by binding.
+  return parsedFn;
+}
+
+function subtractOffset(expressionFn, offset) {
+  if (offset === 0) {
+    return expressionFn;
+  }
+  function minusOffset(value) {
+    return (value == void 0) ? value : value - offset;
+  }
+  function parsedFn(context) { return minusOffset(expressionFn(context)); }
+  var unwatch;
+  parsedFn['$$watchDelegate'] = function watchDelegate(scope, listener, objectEquality) {
+    unwatch = scope['$watch'](expressionFn,
+        function pluralExpressionWatchListener(newValue, oldValue) {
+          if (isFunction(listener)) { listener.call(null, minusOffset(newValue), minusOffset(oldValue), scope); }
+        },
+        objectEquality);
+    return unwatch;
+  };
+  return parsedFn;
+}
diff --git a/src/ngMessageFormat/messageFormatInterpolationParts.js b/src/ngMessageFormat/messageFormatInterpolationParts.js
new file mode 100644
index 000000000000..3a31d427c8f6
--- /dev/null
+++ b/src/ngMessageFormat/messageFormatInterpolationParts.js
@@ -0,0 +1,133 @@
+'use strict';
+
+// NOTE: ADVANCED_OPTIMIZATIONS mode.
+//
+// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
+// constructs incompatible with that mode.
+
+/* global $interpolateMinErr: false */
+/* global isFunction: false */
+/* global parseTextLiteral: false */
+
+/**
+ * @constructor
+ * @private
+ */
+function InterpolationParts(trustedContext, allOrNothing) {
+  this.trustedContext = trustedContext;
+  this.allOrNothing = allOrNothing;
+  this.textParts = [];
+  this.expressionFns = [];
+  this.expressionIndices = [];
+  this.partialText = '';
+  this.concatParts = null;
+}
+
+InterpolationParts.prototype.flushPartialText = function flushPartialText() {
+  if (this.partialText) {
+    if (this.concatParts == null) {
+      this.textParts.push(this.partialText);
+    } else {
+      this.textParts.push(this.concatParts.join(''));
+      this.concatParts = null;
+    }
+    this.partialText = '';
+  }
+};
+
+InterpolationParts.prototype.addText = function addText(text) {
+  if (text.length) {
+    if (!this.partialText) {
+      this.partialText = text;
+    } else if (this.concatParts) {
+      this.concatParts.push(text);
+    } else {
+      this.concatParts = [this.partialText, text];
+    }
+  }
+};
+
+InterpolationParts.prototype.addExpressionFn = function addExpressionFn(expressionFn) {
+  this.flushPartialText();
+  this.expressionIndices.push(this.textParts.length);
+  this.expressionFns.push(expressionFn);
+  this.textParts.push('');
+};
+
+InterpolationParts.prototype.getExpressionValues = function getExpressionValues(context) {
+  var expressionValues = new Array(this.expressionFns.length);
+  for (var i = 0; i < this.expressionFns.length; i++) {
+    expressionValues[i] = this.expressionFns[i](context);
+  }
+  return expressionValues;
+};
+
+InterpolationParts.prototype.getResult = function getResult(expressionValues) {
+  for (var i = 0; i < this.expressionIndices.length; i++) {
+    var expressionValue = expressionValues[i];
+    if (this.allOrNothing && expressionValue === void 0) return;
+    this.textParts[this.expressionIndices[i]] = expressionValue;
+  }
+  return this.textParts.join('');
+};
+
+
+InterpolationParts.prototype.toParsedFn = function toParsedFn(mustHaveExpression, originalText) {
+  var self = this;
+  this.flushPartialText();
+  if (mustHaveExpression && this.expressionFns.length === 0) {
+    return void 0;
+  }
+  if (this.textParts.length === 0) {
+    return parseTextLiteral('');
+  }
+  if (this.trustedContext && this.textParts.length > 1) {
+    $interpolateMinErr['throwNoconcat'](originalText);
+  }
+  if (this.expressionFns.length === 0) {
+    if (this.textParts.length != 1) { this.errorInParseLogic(); }
+    return parseTextLiteral(this.textParts[0]);
+  }
+  var parsedFn = function(context) {
+    return self.getResult(self.getExpressionValues(context));
+  };
+  parsedFn['$$watchDelegate'] = function $$watchDelegate(scope, listener, objectEquality) {
+    return self.watchDelegate(scope, listener, objectEquality);
+  };
+
+  parsedFn['exp'] = originalText; // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
+  parsedFn['expressions'] = new Array(this.expressionFns.length); // Require this to call $compile.$$addBindingInfo() which allows Protractor to find elements by binding.
+  for (var i = 0; i < this.expressionFns.length; i++) {
+    parsedFn['expressions'][i] = this.expressionFns[i]['exp'];
+  }
+
+  return parsedFn;
+};
+
+InterpolationParts.prototype.watchDelegate = function watchDelegate(scope, listener, objectEquality) {
+  var watcher = new InterpolationPartsWatcher(this, scope, listener, objectEquality);
+  return function() { watcher.cancelWatch(); };
+};
+
+function InterpolationPartsWatcher(interpolationParts, scope, listener, objectEquality) {
+  this.interpolationParts = interpolationParts;
+  this.scope = scope;
+  this.previousResult = (void 0);
+  this.listener = listener;
+  var self = this;
+  this.expressionFnsWatcher = scope['$watchGroup'](interpolationParts.expressionFns, function(newExpressionValues, oldExpressionValues) {
+    self.watchListener(newExpressionValues, oldExpressionValues);
+  });
+}
+
+InterpolationPartsWatcher.prototype.watchListener = function watchListener(newExpressionValues, oldExpressionValues) {
+  var result = this.interpolationParts.getResult(newExpressionValues);
+  if (isFunction(this.listener)) {
+    this.listener.call(null, result, newExpressionValues === oldExpressionValues ? result : this.previousResult, this.scope);
+  }
+  this.previousResult = result;
+};
+
+InterpolationPartsWatcher.prototype.cancelWatch = function cancelWatch() {
+  this.expressionFnsWatcher();
+};
diff --git a/src/ngMessageFormat/messageFormatParser.js b/src/ngMessageFormat/messageFormatParser.js
new file mode 100644
index 000000000000..7bca41c98409
--- /dev/null
+++ b/src/ngMessageFormat/messageFormatParser.js
@@ -0,0 +1,524 @@
+'use strict';
+
+// NOTE: ADVANCED_OPTIMIZATIONS mode.
+//
+// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
+// constructs incompatible with that mode.
+
+/* global $interpolateMinErr: false */
+/* global indexToLineAndColumn: false */
+/* global InterpolationParts: false */
+/* global PluralMessage: false */
+/* global SelectMessage: false */
+/* global subtractOffset: false */
+
+// The params src and dst are exactly one of two types: NestedParserState or MessageFormatParser.
+// This function is fully optimized by V8. (inspect via IRHydra or --trace-deopt.)
+// The idea behind writing it this way is to avoid repeating oneself.  This is the ONE place where
+// the parser state that is saved/restored when parsing nested mustaches is specified.
+function copyNestedParserState(src, dst) {
+  dst.expressionFn = src.expressionFn;
+  dst.expressionMinusOffsetFn = src.expressionMinusOffsetFn;
+  dst.pluralOffset = src.pluralOffset;
+  dst.choices = src.choices;
+  dst.choiceKey = src.choiceKey;
+  dst.interpolationParts = src.interpolationParts;
+  dst.ruleChoiceKeyword = src.ruleChoiceKeyword;
+  dst.msgStartIndex = src.msgStartIndex;
+  dst.expressionStartIndex = src.expressionStartIndex;
+}
+
+function NestedParserState(parser) {
+  copyNestedParserState(parser, this);
+}
+
+/**
+ * @constructor
+ * @private
+ */
+function MessageFormatParser(text, startIndex, $parse, pluralCat, stringifier,
+                             mustHaveExpression, trustedContext, allOrNothing) {
+  this.text = text;
+  this.index = startIndex || 0;
+  this.$parse = $parse;
+  this.pluralCat = pluralCat;
+  this.stringifier = stringifier;
+  this.mustHaveExpression = !!mustHaveExpression;
+  this.trustedContext = trustedContext;
+  this.allOrNothing = !!allOrNothing;
+  this.expressionFn = null;
+  this.expressionMinusOffsetFn = null;
+  this.pluralOffset = null;
+  this.choices = null;
+  this.choiceKey = null;
+  this.interpolationParts = null;
+  this.msgStartIndex = null;
+  this.nestedStateStack = [];
+  this.parsedFn = null;
+  this.rule = null;
+  this.ruleStack = null;
+  this.ruleChoiceKeyword = null;
+  this.interpNestLevel = null;
+  this.expressionStartIndex = null;
+  this.stringStartIndex = null;
+  this.stringQuote = null;
+  this.stringInterestsRe = null;
+  this.angularOperatorStack = null;
+  this.textPart = null;
+}
+
+// preserve v8 optimization.
+var EMPTY_STATE = new NestedParserState(new MessageFormatParser(
+        /* text= */ '', /* startIndex= */ 0, /* $parse= */ null, /* pluralCat= */ null, /* stringifier= */ null,
+        /* mustHaveExpression= */ false, /* trustedContext= */ null, /* allOrNothing */ false));
+
+MessageFormatParser.prototype.pushState = function pushState() {
+  this.nestedStateStack.push(new NestedParserState(this));
+  copyNestedParserState(EMPTY_STATE, this);
+};
+
+MessageFormatParser.prototype.popState = function popState() {
+  if (this.nestedStateStack.length === 0) {
+    this.errorInParseLogic();
+  }
+  var previousState = this.nestedStateStack.pop();
+  copyNestedParserState(previousState, this);
+};
+
+// Oh my JavaScript!  Who knew you couldn't match a regex at a specific
+// location in a string but will always search forward?!
+// Apparently you'll be growing this ability via the sticky flag (y) in
+// ES6.  I'll just to work around you for now.
+MessageFormatParser.prototype.matchRe = function matchRe(re, search) {
+  re.lastIndex = this.index;
+  var match = re.exec(this.text);
+  if (match != null && (search === true || (match.index == this.index))) {
+    this.index = re.lastIndex;
+    return match;
+  }
+  return null;
+};
+
+MessageFormatParser.prototype.searchRe = function searchRe(re) {
+  return this.matchRe(re, true);
+};
+
+
+MessageFormatParser.prototype.consumeRe = function consumeRe(re) {
+  // Without the sticky flag, we can't use the .test() method to consume a
+  // match at the current index.  Instead, we'll use the slower .exec() method
+  // and verify match.index.
+  return !!this.matchRe(re);
+};
+
+// Run through our grammar avoiding deeply nested function call chains.
+MessageFormatParser.prototype.run = function run(initialRule) {
+  this.ruleStack = [initialRule];
+  do {
+    this.rule = this.ruleStack.pop();
+    while (this.rule) {
+      this.rule();
+    }
+    this.assertRuleOrNull(this.rule);
+  } while (this.ruleStack.length > 0);
+};
+
+MessageFormatParser.prototype.errorInParseLogic = function errorInParseLogic() {
+    throw $interpolateMinErr('logicbug',
+        'The messageformat parser has encountered an internal error.  Please file a github issue against the AngularJS project and provide this message text that triggers the bug.  Text: “{0}”',
+        this.text);
+};
+
+MessageFormatParser.prototype.assertRuleOrNull = function assertRuleOrNull(rule) {
+  if (rule === void 0) {
+    this.errorInParseLogic();
+  }
+};
+
+var NEXT_WORD_RE = /\s*(\w+)\s*/g;
+MessageFormatParser.prototype.errorExpecting = function errorExpecting() {
+  // What was wrong with the syntax? Unsupported type, missing comma, or something else?
+  var match = this.matchRe(NEXT_WORD_RE), position;
+  if (match == null) {
+    position = indexToLineAndColumn(this.text, this.index);
+    throw $interpolateMinErr('reqarg',
+        'Expected one of “plural” or “select” at line {0}, column {1} of text “{2}”',
+        position.line, position.column, this.text);
+  }
+  var word = match[1];
+  if (word == "select" || word == "plural") {
+    position = indexToLineAndColumn(this.text, this.index);
+    throw $interpolateMinErr('reqcomma',
+        'Expected a comma after the keyword “{0}” at line {1}, column {2} of text “{3}”',
+        word, position.line, position.column, this.text);
+  } else {
+    position = indexToLineAndColumn(this.text, this.index);
+    throw $interpolateMinErr('unknarg',
+        'Unsupported keyword “{0}” at line {0}, column {1}. Only “plural” and “select” are currently supported.  Text: “{3}”',
+        word, position.line, position.column, this.text);
+  }
+};
+
+var STRING_START_RE = /['"]/g;
+MessageFormatParser.prototype.ruleString = function ruleString() {
+  var match = this.matchRe(STRING_START_RE);
+  if (match == null) {
+    var position = indexToLineAndColumn(this.text, this.index);
+    throw $interpolateMinErr('wantstring',
+        'Expected the beginning of a string at line {0}, column {1} in text “{2}”',
+        position.line, position.column, this.text);
+  }
+  this.startStringAtMatch(match);
+};
+
+MessageFormatParser.prototype.startStringAtMatch = function startStringAtMatch(match) {
+  this.stringStartIndex = match.index;
+  this.stringQuote = match[0];
+  this.stringInterestsRe = this.stringQuote == "'" ? SQUOTED_STRING_INTEREST_RE : DQUOTED_STRING_INTEREST_RE;
+  this.rule = this.ruleInsideString;
+};
+
+var SQUOTED_STRING_INTEREST_RE = /\\(?:\\|'|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{2}|[0-7]{3}|\r\n|\n|[\s\S])|'/g;
+var DQUOTED_STRING_INTEREST_RE = /\\(?:\\|"|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{2}|[0-7]{3}|\r\n|\n|[\s\S])|"/g;
+MessageFormatParser.prototype.ruleInsideString = function ruleInsideString() {
+  var match = this.searchRe(this.stringInterestsRe);
+  if (match == null) {
+    var position = indexToLineAndColumn(this.text, this.stringStartIndex);
+    throw $interpolateMinErr('untermstr',
+        'The string beginning at line {0}, column {1} is unterminated in text “{2}”',
+        position.line, position.column, this.text);
+  }
+  var chars = match[0];
+  if (match == this.stringQuote) {
+    this.rule = null;
+  }
+};
+
+var PLURAL_OR_SELECT_ARG_TYPE_RE = /\s*(plural|select)\s*,\s*/g;
+MessageFormatParser.prototype.rulePluralOrSelect = function rulePluralOrSelect() {
+  var match = this.searchRe(PLURAL_OR_SELECT_ARG_TYPE_RE);
+  if (match == null) {
+    this.errorExpecting();
+  }
+  var argType = match[1];
+  switch (argType) {
+    case "plural": this.rule = this.rulePluralStyle; break;
+    case "select": this.rule = this.ruleSelectStyle; break;
+    default: this.errorInParseLogic();
+  }
+};
+
+MessageFormatParser.prototype.rulePluralStyle = function rulePluralStyle() {
+  this.choices = Object.create(null);
+  this.ruleChoiceKeyword = this.rulePluralValueOrKeyword;
+  this.rule = this.rulePluralOffset;
+};
+
+MessageFormatParser.prototype.ruleSelectStyle = function ruleSelectStyle() {
+  this.choices = Object.create(null);
+  this.ruleChoiceKeyword = this.ruleSelectKeyword;
+  this.rule = this.ruleSelectKeyword;
+};
+
+var NUMBER_RE = /[0]|(?:[1-9][0-9]*)/g;
+var PLURAL_OFFSET_RE = new RegExp("\\s*offset\\s*:\\s*(" + NUMBER_RE.source + ")", "g");
+
+MessageFormatParser.prototype.rulePluralOffset = function rulePluralOffset() {
+  var match = this.matchRe(PLURAL_OFFSET_RE);
+  this.pluralOffset = (match == null) ? 0 : parseInt(match[1], 10);
+  this.expressionMinusOffsetFn = subtractOffset(this.expressionFn, this.pluralOffset);
+  this.rule = this.rulePluralValueOrKeyword;
+};
+
+MessageFormatParser.prototype.assertChoiceKeyIsNew = function assertChoiceKeyIsNew(choiceKey, index) {
+  if (this.choices[choiceKey] !== void 0) {
+    var position = indexToLineAndColumn(this.text, index);
+    throw $interpolateMinErr('dupvalue',
+        'The choice “{0}” is specified more than once. Duplicate key is at line {1}, column {2} in text “{3}”',
+        choiceKey, position.line, position.column, this.text);
+  }
+};
+
+var SELECT_KEYWORD = /\s*(\w+)/g;
+MessageFormatParser.prototype.ruleSelectKeyword = function ruleSelectKeyword() {
+  var match = this.matchRe(SELECT_KEYWORD);
+  if (match == null) {
+    this.parsedFn = new SelectMessage(this.expressionFn, this.choices).parsedFn;
+    this.rule = null;
+    return;
+  }
+  this.choiceKey = match[1];
+  this.assertChoiceKeyIsNew(this.choiceKey, match.index);
+  this.rule = this.ruleMessageText;
+};
+
+var EXPLICIT_VALUE_OR_KEYWORD_RE = new RegExp("\\s*(?:(?:=(" + NUMBER_RE.source + "))|(\\w+))", "g");
+MessageFormatParser.prototype.rulePluralValueOrKeyword = function rulePluralValueOrKeyword() {
+  var match = this.matchRe(EXPLICIT_VALUE_OR_KEYWORD_RE);
+  if (match == null) {
+    this.parsedFn = new PluralMessage(this.expressionFn, this.choices, this.pluralOffset, this.pluralCat).parsedFn;
+    this.rule = null;
+    return;
+  }
+  if (match[1] != null) {
+    this.choiceKey = parseInt(match[1], 10);
+  } else {
+    this.choiceKey = match[2];
+  }
+  this.assertChoiceKeyIsNew(this.choiceKey, match.index);
+  this.rule = this.ruleMessageText;
+};
+
+var BRACE_OPEN_RE = /\s*{/g;
+var BRACE_CLOSE_RE = /}/g;
+MessageFormatParser.prototype.ruleMessageText = function ruleMessageText() {
+  if (!this.consumeRe(BRACE_OPEN_RE)) {
+    var position = indexToLineAndColumn(this.text, this.index);
+    throw $interpolateMinErr('reqopenbrace',
+        'The plural choice “{0}” must be followed by a message in braces at line {1}, column {2} in text “{3}”',
+        this.choiceKey, position.line, position.column, this.text);
+  }
+  this.msgStartIndex = this.index;
+  this.interpolationParts = new InterpolationParts(this.trustedContext, this.allOrNothing);
+  this.rule = this.ruleInInterpolationOrMessageText;
+};
+
+// Note: Since "\" is used as an escape character, don't allow it to be part of the
+// startSymbol/endSymbol when I add the feature to allow them to be redefined.
+var INTERP_OR_END_MESSAGE_RE = /\\.|{{|}/g;
+var INTERP_OR_PLURALVALUE_OR_END_MESSAGE_RE = /\\.|{{|#|}/g;
+var ESCAPE_OR_MUSTACHE_BEGIN_RE = /\\.|{{/g;
+MessageFormatParser.prototype.advanceInInterpolationOrMessageText = function advanceInInterpolationOrMessageText() {
+  var currentIndex = this.index, match, re;
+  if (this.ruleChoiceKeyword == null) { // interpolation
+    match = this.searchRe(ESCAPE_OR_MUSTACHE_BEGIN_RE);
+    if (match == null) { // End of interpolation text.  Nothing more to process.
+      this.textPart = this.text.substring(currentIndex);
+      this.index = this.text.length;
+      return null;
+    }
+  } else {
+    match = this.searchRe(this.ruleChoiceKeyword == this.rulePluralValueOrKeyword ?
+                          INTERP_OR_PLURALVALUE_OR_END_MESSAGE_RE : INTERP_OR_END_MESSAGE_RE);
+    if (match == null) {
+      var position = indexToLineAndColumn(this.text, this.msgStartIndex);
+      throw $interpolateMinErr('reqendbrace',
+          'The plural/select choice “{0}” message starting at line {1}, column {2} does not have an ending closing brace. Text “{3}”',
+          this.choiceKey, position.line, position.column, this.text);
+    }
+  }
+  // match is non-null.
+  var token = match[0];
+  this.textPart = this.text.substring(currentIndex, match.index);
+  return token;
+};
+
+MessageFormatParser.prototype.ruleInInterpolationOrMessageText = function ruleInInterpolationOrMessageText() {
+  var currentIndex = this.index;
+  var token = this.advanceInInterpolationOrMessageText();
+  if (token == null) {
+    // End of interpolation text.  Nothing more to process.
+    this.index = this.text.length;
+    this.interpolationParts.addText(this.text.substring(currentIndex));
+    this.rule = null;
+    return;
+  }
+  if (token[0] == "\\") {
+    // unescape next character and continue
+    this.interpolationParts.addText(this.textPart + token[1]);
+    return;
+  }
+  this.interpolationParts.addText(this.textPart);
+  if (token == "{{") {
+    this.pushState();
+    this.ruleStack.push(this.ruleEndMustacheInInterpolationOrMessage);
+    this.rule = this.ruleEnteredMustache;
+  } else if (token == "}") {
+    this.choices[this.choiceKey] = this.interpolationParts.toParsedFn(/*mustHaveExpression=*/false, this.text);
+    this.rule = this.ruleChoiceKeyword;
+  } else if (token == "#") {
+    this.interpolationParts.addExpressionFn(this.expressionMinusOffsetFn);
+  } else {
+    this.errorInParseLogic();
+  }
+};
+
+MessageFormatParser.prototype.ruleInterpolate = function ruleInterpolate() {
+  this.interpolationParts = new InterpolationParts(this.trustedContext, this.allOrNothing);
+  this.rule = this.ruleInInterpolation;
+};
+
+MessageFormatParser.prototype.ruleInInterpolation = function ruleInInterpolation() {
+  var currentIndex = this.index;
+  var match = this.searchRe(ESCAPE_OR_MUSTACHE_BEGIN_RE);
+  if (match == null) {
+    // End of interpolation text.  Nothing more to process.
+    this.index = this.text.length;
+    this.interpolationParts.addText(this.text.substring(currentIndex));
+    this.parsedFn = this.interpolationParts.toParsedFn(this.mustHaveExpression, this.text);
+    this.rule = null;
+    return;
+  }
+  var token = match[0];
+  if (token[0] == "\\") {
+    // unescape next character and continue
+    this.interpolationParts.addText(this.text.substring(currentIndex, match.index) + token[1]);
+    return;
+  }
+  this.interpolationParts.addText(this.text.substring(currentIndex, match.index));
+  this.pushState();
+  this.ruleStack.push(this.ruleInterpolationEndMustache);
+  this.rule = this.ruleEnteredMustache;
+};
+
+MessageFormatParser.prototype.ruleInterpolationEndMustache = function ruleInterpolationEndMustache() {
+  var expressionFn = this.parsedFn;
+  this.popState();
+  this.interpolationParts.addExpressionFn(expressionFn);
+  this.rule = this.ruleInInterpolation;
+};
+
+MessageFormatParser.prototype.ruleEnteredMustache = function ruleEnteredMustache() {
+  this.parsedFn = null;
+  this.ruleStack.push(this.ruleEndMustache);
+  this.rule = this.ruleAngularExpression;
+};
+
+MessageFormatParser.prototype.ruleEndMustacheInInterpolationOrMessage = function ruleEndMustacheInInterpolationOrMessage() {
+  var expressionFn = this.parsedFn;
+  this.popState();
+  this.interpolationParts.addExpressionFn(expressionFn);
+  this.rule = this.ruleInInterpolationOrMessageText;
+};
+
+
+
+var INTERP_END_RE = /\s*}}/g;
+MessageFormatParser.prototype.ruleEndMustache = function ruleEndMustache() {
+  var match = this.matchRe(INTERP_END_RE);
+  if (match == null) {
+    var position = indexToLineAndColumn(this.text, this.index);
+    throw $interpolateMinErr('reqendinterp',
+        'Expecting end of interpolation symbol, “{0}”, at line {1}, column {2} in text “{3}”',
+        '}}', position.line, position.column, this.text);
+  }
+  if (this.parsedFn == null) {
+    // If we parsed a MessageFormat extension, (e.g. select/plural today, maybe more some other
+    // day), then the result *has* to be a string and those rules would have already set
+    // this.parsedFn.  If there was no MessageFormat extension, then there is no requirement to
+    // stringify the result and parsedFn isn't set.  We set it here.  While we could have set it
+    // unconditionally when exiting the Angular expression, I intend for us to not just replace
+    // $interpolate, but also to replace $parse in a future version (so ng-bind can work), and in
+    // such a case we do not want to unnecessarily stringify something if it's not going to be used
+    // in a string context.
+    this.parsedFn = this.$parse(this.expressionFn, this.stringifier);
+    this.parsedFn['exp'] = this.expressionFn['exp']; // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
+    this.parsedFn['expressions'] = this.expressionFn['expressions']; // Require this to call $compile.$$addBindingInfo() which allows Protractor to find elements by binding.
+  }
+  this.rule = null;
+};
+
+MessageFormatParser.prototype.ruleAngularExpression = function ruleAngularExpression() {
+  this.angularOperatorStack = [];
+  this.expressionStartIndex = this.index;
+  this.rule = this.ruleInAngularExpression;
+};
+
+function getEndOperator(opBegin) {
+  switch (opBegin) {
+    case "{": return "}";
+    case "[": return "]";
+    case "(": return ")";
+    default: return null;
+  }
+}
+
+function getBeginOperator(opEnd) {
+  switch (opEnd) {
+    case "}": return "{";
+    case "]": return "[";
+    case ")": return "(";
+    default: return null;
+  }
+}
+
+// TODO(chirayu): The interpolation endSymbol must also be accounted for. It
+// just so happens that "}" is an operator so it's in the list below.  But we
+// should support any other type of start/end interpolation symbol.
+var INTERESTING_OPERATORS_RE = /[[\]{}()'",]/g;
+MessageFormatParser.prototype.ruleInAngularExpression = function ruleInAngularExpression() {
+  var startIndex = this.index;
+  var match = this.searchRe(INTERESTING_OPERATORS_RE);
+  var position;
+  if (match == null) {
+    if (this.angularOperatorStack.length === 0) {
+      // This is the end of the Angular expression so this is actually a
+      // success.  Note that when inside an interpolation, this means we even
+      // consumed the closing interpolation symbols if they were curlies.  This
+      // is NOT an error at this point but will become an error further up the
+      // stack when the part that saw the opening curlies is unable to find the
+      // closing ones.
+      this.index = this.text.length;
+      this.expressionFn = this.$parse(this.text.substring(this.expressionStartIndex, this.index));
+      // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
+      this.expressionFn['exp'] = this.text.substring(this.expressionStartIndex, this.index);
+      this.expressionFn['expressions'] = this.expressionFn['expressions'];
+      this.rule = null;
+      return;
+    }
+    var innermostOperator = this.angularOperatorStack[0];
+    throw $interpolateMinErr('badexpr',
+        'Unexpected end of Angular expression.  Expecting operator “{0}” at the end of the text “{1}”',
+        this.getEndOperator(innermostOperator), this.text);
+  }
+  var operator = match[0];
+  if (operator == "'" || operator == '"') {
+    this.ruleStack.push(this.ruleInAngularExpression);
+    this.startStringAtMatch(match);
+    return;
+  }
+  if (operator == ",") {
+    if (this.trustedContext) {
+      position = indexToLineAndColumn(this.text, this.index);
+      throw $interpolateMinErr('unsafe',
+          'Use of select/plural MessageFormat syntax is currently disallowed in a secure context ({0}).  At line {1}, column {2} of text “{3}”',
+          this.trustedContext, position.line, position.column, this.text);
+    }
+    // only the top level comma has relevance.
+    if (this.angularOperatorStack.length === 0) {
+      // todo: does this need to be trimmed?
+      this.expressionFn = this.$parse(this.text.substring(this.expressionStartIndex, match.index));
+      // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
+      this.expressionFn['exp'] = this.text.substring(this.expressionStartIndex, match.index);
+      this.expressionFn['expressions'] = this.expressionFn['expressions'];
+      this.rule = null;
+      this.rule = this.rulePluralOrSelect;
+    }
+    return;
+  }
+  if (getEndOperator(operator) != null) {
+    this.angularOperatorStack.unshift(operator);
+    return;
+  }
+  var beginOperator = getBeginOperator(operator);
+  if (beginOperator == null) {
+    this.errorInParseLogic();
+  }
+  if (this.angularOperatorStack.length > 0) {
+    if (beginOperator == this.angularOperatorStack[0]) {
+      this.angularOperatorStack.shift();
+      return;
+    }
+    position = indexToLineAndColumn(this.text, this.index);
+    throw $interpolateMinErr('badexpr',
+        'Unexpected operator “{0}” at line {1}, column {2} in text. Was expecting “{3}”. Text: “{4}”',
+        operator, position.line, position.column, getEndOperator(this.angularOperatorStack[0]), this.text);
+  }
+  // We are trying to pop off the operator stack but there really isn't anything to pop off.
+  this.index = match.index;
+  this.expressionFn = this.$parse(this.text.substring(this.expressionStartIndex, this.index));
+  // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
+  this.expressionFn['exp'] = this.text.substring(this.expressionStartIndex, this.index);
+  this.expressionFn['expressions'] = this.expressionFn['expressions'];
+  this.rule = null;
+};
diff --git a/src/ngMessageFormat/messageFormatSelector.js b/src/ngMessageFormat/messageFormatSelector.js
new file mode 100644
index 000000000000..b7cc52e37957
--- /dev/null
+++ b/src/ngMessageFormat/messageFormatSelector.js
@@ -0,0 +1,121 @@
+'use strict';
+
+// NOTE: ADVANCED_OPTIMIZATIONS mode.
+//
+// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
+// constructs incompatible with that mode.
+
+/* global $interpolateMinErr: false */
+/* global isFunction: false */
+/* global noop: false */
+
+/**
+ * @constructor
+ * @private
+ */
+function MessageSelectorBase(expressionFn, choices) {
+  var self = this;
+  this.expressionFn = expressionFn;
+  this.choices = choices;
+  if (choices["other"] === void 0) {
+    throw $interpolateMinErr('reqother', '“other” is a required option.');
+  }
+  this.parsedFn = function(context) { return self.getResult(context); };
+  this.parsedFn['$$watchDelegate'] = function $$watchDelegate(scope, listener, objectEquality) {
+    return self.watchDelegate(scope, listener, objectEquality);
+  };
+  this.parsedFn['exp'] = expressionFn['exp'];
+  this.parsedFn['expressions'] = expressionFn['expressions'];
+}
+
+MessageSelectorBase.prototype.getMessageFn = function getMessageFn(value) {
+  return this.choices[this.categorizeValue(value)];
+};
+
+MessageSelectorBase.prototype.getResult = function getResult(context) {
+  return this.getMessageFn(this.expressionFn(context))(context);
+};
+
+MessageSelectorBase.prototype.watchDelegate = function watchDelegate(scope, listener, objectEquality) {
+  var watchers = new MessageSelectorWatchers(this, scope, listener, objectEquality);
+  return function() { watchers.cancelWatch(); };
+};
+
+/**
+ * @constructor
+ * @private
+ */
+function MessageSelectorWatchers(msgSelector, scope, listener, objectEquality) {
+  var self = this;
+  this.scope = scope;
+  this.msgSelector = msgSelector;
+  this.listener = listener;
+  this.objectEquality = objectEquality;
+  this.lastMessage = void 0;
+  this.messageFnWatcher = noop;
+  var expressionFnListener = function(newValue, oldValue) { return self.expressionFnListener(newValue, oldValue); };
+  this.expressionFnWatcher = scope['$watch'](msgSelector.expressionFn, expressionFnListener, objectEquality);
+}
+
+MessageSelectorWatchers.prototype.expressionFnListener = function expressionFnListener(newValue, oldValue) {
+  var self = this;
+  this.messageFnWatcher();
+  var messageFnListener = function(newMessage, oldMessage) { return self.messageFnListener(newMessage, oldMessage); };
+  var messageFn = this.msgSelector.getMessageFn(newValue);
+  this.messageFnWatcher = this.scope['$watch'](messageFn, messageFnListener, this.objectEquality);
+};
+
+MessageSelectorWatchers.prototype.messageFnListener = function messageFnListener(newMessage, oldMessage) {
+  if (isFunction(this.listener)) {
+    this.listener.call(null, newMessage, newMessage === oldMessage ? newMessage : this.lastMessage, this.scope);
+  }
+  this.lastMessage = newMessage;
+};
+
+MessageSelectorWatchers.prototype.cancelWatch = function cancelWatch() {
+  this.expressionFnWatcher();
+  this.messageFnWatcher();
+};
+
+/**
+ * @constructor
+ * @extends MessageSelectorBase
+ * @private
+ */
+function SelectMessage(expressionFn, choices) {
+  MessageSelectorBase.call(this, expressionFn, choices);
+}
+
+function SelectMessageProto() {}
+SelectMessageProto.prototype = MessageSelectorBase.prototype;
+
+SelectMessage.prototype = new SelectMessageProto();
+SelectMessage.prototype.categorizeValue = function categorizeSelectValue(value) {
+  return (this.choices[value] !== void 0) ? value : "other";
+};
+
+/**
+ * @constructor
+ * @extends MessageSelectorBase
+ * @private
+ */
+function PluralMessage(expressionFn, choices, offset, pluralCat) {
+  MessageSelectorBase.call(this, expressionFn, choices);
+  this.offset = offset;
+  this.pluralCat = pluralCat;
+}
+
+function PluralMessageProto() {}
+PluralMessageProto.prototype = MessageSelectorBase.prototype;
+
+PluralMessage.prototype = new PluralMessageProto();
+PluralMessage.prototype.categorizeValue = function categorizePluralValue(value) {
+  if (isNaN(value)) {
+    return "other";
+  } else if (this.choices[value] !== void 0) {
+    return value;
+  } else {
+    var category = this.pluralCat(value - this.offset);
+    return (this.choices[category] !== void 0) ? category : "other";
+  }
+};
diff --git a/src/ngMessageFormat/messageFormatService.js b/src/ngMessageFormat/messageFormatService.js
new file mode 100644
index 000000000000..98baf9d3143f
--- /dev/null
+++ b/src/ngMessageFormat/messageFormatService.js
@@ -0,0 +1,121 @@
+'use strict';
+
+// NOTE: ADVANCED_OPTIMIZATIONS mode.
+//
+// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
+// constructs incompatible with that mode.
+
+/* global $interpolateMinErr: false */
+/* global MessageFormatParser: false */
+/* global stringify: false */
+
+/**
+ * @ngdoc service
+ * @name $$messageFormat
+ *
+ * @description
+ * Angular internal service to recognize MessageFormat extensions in interpolation expressions.
+ * For more information, see:
+ * https://docs.google.com/a/google.com/document/d/1pbtW2yvtmFBikfRrJd8VAsabiFkKezmYZ_PbgdjQOVU/edit
+ *
+ * ## Example
+ *
+ * <example name="ngMessageFormat-example" module="msgFmtExample" deps="angular-message-format.min.js">
+ * <file name="index.html">
+ *   <div ng-controller="AppController">
+ *     <button ng-click="decreaseRecipients()" id="decreaseRecipients">decreaseRecipients</button><br>
+ *     <span>{{recipients.length, plural, offset:1
+ *             =0    {{{sender.name}} gave no gifts (\#=#)}
+ *             =1    {{{sender.name}} gave one gift to {{recipients[0].name}} (\#=#)}
+ *             one   {{{sender.name}} gave {{recipients[0].name}} and one other person a gift (\#=#)}
+ *             other {{{sender.name}} gave {{recipients[0].name}} and # other people a gift (\#=#)}
+ *           }}</span>
+ *   </div>
+ * </file>
+ *
+ * <file name="script.js">
+ *   function Person(name, gender) {
+ *     this.name = name;
+ *     this.gender = gender;
+ *   }
+ *
+ *   var alice   = new Person("Alice", "female"),
+ *       bob     = new Person("Bob", "male"),
+ *       charlie = new Person("Charlie", "male"),
+ *       harry   = new Person("Harry Potter", "male");
+ *
+ *   angular.module('msgFmtExample', ['ngMessageFormat'])
+ *     .controller('AppController', ['$scope', function($scope) {
+ *         $scope.recipients = [alice, bob, charlie];
+ *         $scope.sender = harry;
+ *         $scope.decreaseRecipients = function() {
+ *           --$scope.recipients.length;
+ *         };
+ *       }]);
+ * </file>
+ *
+ * <file name="protractor.js" type="protractor">
+ *   describe('MessageFormat plural', function() {
+ *     it('should pluralize initial values', function() {
+ *       var messageElem = element(by.binding('recipients.length')), decreaseRecipientsBtn = element(by.id('decreaseRecipients'));
+ *       expect(messageElem.getText()).toEqual('Harry Potter gave Alice and 2 other people a gift (#=2)');
+ *       decreaseRecipientsBtn.click();
+ *       expect(messageElem.getText()).toEqual('Harry Potter gave Alice and one other person a gift (#=1)');
+ *       decreaseRecipientsBtn.click();
+ *       expect(messageElem.getText()).toEqual('Harry Potter gave one gift to Alice (#=0)');
+ *       decreaseRecipientsBtn.click();
+ *       expect(messageElem.getText()).toEqual('Harry Potter gave no gifts (#=-1)');
+ *     });
+ *   });
+ * </file>
+ * </example>
+ */
+var $$MessageFormatFactory = ['$parse', '$locale', '$sce', '$exceptionHandler', function $$messageFormat(
+                   $parse,   $locale,   $sce,   $exceptionHandler) {
+
+  function getStringifier(trustedContext, allOrNothing, text) {
+    return function stringifier(value) {
+      try {
+        value = trustedContext ? $sce['getTrusted'](trustedContext, value) : $sce['valueOf'](value);
+        return allOrNothing && (value === void 0) ? value : stringify(value);
+      } catch (err) {
+        $exceptionHandler($interpolateMinErr['interr'](text, err));
+      }
+    };
+  }
+
+  function interpolate(text, mustHaveExpression, trustedContext, allOrNothing) {
+    var stringifier = getStringifier(trustedContext, allOrNothing, text);
+    var parser = new MessageFormatParser(text, 0, $parse, $locale['pluralCat'], stringifier,
+                                         mustHaveExpression, trustedContext, allOrNothing);
+    parser.run(parser.ruleInterpolate);
+    return parser.parsedFn;
+  }
+
+  return {
+    'interpolate': interpolate
+  };
+}];
+
+var $$interpolateDecorator = ['$$messageFormat', '$delegate', function $$interpolateDecorator($$messageFormat, $interpolate) {
+  if ($interpolate['startSymbol']() != "{{" || $interpolate['endSymbol']() != "}}") {
+    throw $interpolateMinErr('nochgmustache', 'angular-message-format.js currently does not allow you to use custom start and end symbols for interpolation.');
+  }
+  var interpolate = $$messageFormat['interpolate'];
+  interpolate['startSymbol'] = $interpolate['startSymbol'];
+  interpolate['endSymbol'] = $interpolate['endSymbol'];
+  return interpolate;
+}];
+
+
+/**
+ * @ngdoc module
+ * @name ngMessageFormat
+ * @packageName angular-message-format
+ * @description
+ */
+var module = window['angular']['module']('ngMessageFormat', ['ng']);
+module['factory']('$$messageFormat', $$MessageFormatFactory);
+module['config'](['$provide', function($provide) {
+  $provide['decorator']('$interpolate', $$interpolateDecorator);
+}]);
diff --git a/src/ngMessages/messages.js b/src/ngMessages/messages.js
index 04b468fe5a4a..14ffe00506b0 100644
--- a/src/ngMessages/messages.js
+++ b/src/ngMessages/messages.js
@@ -1,5 +1,13 @@
 'use strict';
 
+/* jshint ignore:start */
+// this code is in the core, but not in angular-messages.js
+var isArray = angular.isArray;
+var forEach = angular.forEach;
+var isString = angular.isString;
+var jqLite = angular.element;
+/* jshint ignore:end */
+
 /**
  * @ngdoc module
  * @name ngMessages
@@ -12,8 +20,8 @@
  * `ngMessage` directives are designed to handle the complexity, inheritance and priority
  * sequencing based on the order of how the messages are defined in the template.
  *
- * Currently, the ngMessages module only contains the code for the `ngMessages`
- * and `ngMessage` directives.
+ * Currently, the ngMessages module only contains the code for the `ngMessages`, `ngMessagesInclude`
+ * `ngMessage` and `ngMessageExp` directives.
  *
  * # Usage
  * The `ngMessages` directive listens on a key/value collection which is set on the ngMessages attribute.
@@ -23,10 +31,15 @@
  *
  * ```html
  * <form name="myForm">
- *   <input type="text" ng-model="field" name="myField" required minlength="5" />
- *   <div ng-messages="myForm.myField.$error">
+ *   <label>
+ *     Enter text:
+ *     <input type="text" ng-model="field" name="myField" required minlength="5" />
+ *   </label>
+ *   <div ng-messages="myForm.myField.$error" role="alert">
  *     <div ng-message="required">You did not enter a field</div>
- *     <div ng-message="minlength">The value entered is too short</div>
+ *     <div ng-message="minlength, maxlength">
+ *       Your email must be between 5 and 100 characters long
+ *     </div>
  *   </div>
  * </form>
  * ```
@@ -38,7 +51,7 @@
  *
  * ```javascript
  * <!-- keep in mind that ngModel automatically sets these error flags -->
- * myField.$error = { minlength : true, required : false };
+ * myField.$error = { minlength : true, required : true };
  * ```
  *
  * Then the `required` message will be displayed first. When required is false then the `minlength` message
@@ -52,7 +65,11 @@
  * ngMessages directive to make this happen.
  *
  * ```html
+ * <!-- attribute-style usage -->
  * <div ng-messages="myForm.myField.$error" ng-messages-multiple>...</div>
+ *
+ * <!-- element-style usage -->
+ * <ng-messages for="myForm.myField.$error" multiple>...</ng-messages>
  * ```
  *
  * ## Reusing and Overriding Messages
@@ -65,7 +82,10 @@
  *   <div ng-message="required">This field is required</div>
  *   <div ng-message="minlength">This field is too short</div>
  * </script>
- * <div ng-messages="myForm.myField.$error" ng-messages-include="error-messages"></div>
+ *
+ * <div ng-messages="myForm.myField.$error" role="alert">
+ *   <div ng-messages-include="error-messages"></div>
+ * </div>
  * ```
  *
  * However, including generic messages may not be useful enough to match all input fields, therefore,
@@ -80,19 +100,26 @@
  * </script>
  *
  * <form name="myForm">
- *   <input type="email"
- *          id="email"
- *          name="myEmail"
- *          ng-model="email"
- *          minlength="5"
- *          required />
- *
- *   <div ng-messages="myForm.myEmail.$error" ng-messages-include="my-custom-messages">
+ *   <label>
+ *     Email address
+ *     <input type="email"
+ *            id="email"
+ *            name="myEmail"
+ *            ng-model="email"
+ *            minlength="5"
+ *            required />
+ *   </label>
+ *   <!-- any ng-message elements that appear BEFORE the ng-messages-include will
+ *        override the messages present in the ng-messages-include template -->
+ *   <div ng-messages="myForm.myEmail.$error" role="alert">
  *     <!-- this required message has overridden the template message -->
  *     <div ng-message="required">You did not enter your email address</div>
  *
  *     <!-- this is a brand new message and will appear last in the prioritization -->
  *     <div ng-message="email">Your email address is invalid</div>
+ *
+ *     <!-- and here are the generic error messages -->
+ *     <div ng-messages-include="my-custom-messages"></div>
  *   </div>
  * </form>
  * ```
@@ -102,10 +129,70 @@
  * email addresses, date fields, autocomplete inputs, etc...), specialized error messages can be applied
  * while more generic messages can be used to handle other, more general input errors.
  *
+ * ## Dynamic Messaging
+ * ngMessages also supports using expressions to dynamically change key values. Using arrays and
+ * repeaters to list messages is also supported. This means that the code below will be able to
+ * fully adapt itself and display the appropriate message when any of the expression data changes:
+ *
+ * ```html
+ * <form name="myForm">
+ *   <label>
+ *     Email address
+ *     <input type="email"
+ *            name="myEmail"
+ *            ng-model="email"
+ *            minlength="5"
+ *            required />
+ *   </label>
+ *   <div ng-messages="myForm.myEmail.$error" role="alert">
+ *     <div ng-message="required">You did not enter your email address</div>
+ *     <div ng-repeat="errorMessage in errorMessages">
+ *       <!-- use ng-message-exp for a message whose key is given by an expression -->
+ *       <div ng-message-exp="errorMessage.type">{{ errorMessage.text }}</div>
+ *     </div>
+ *   </div>
+ * </form>
+ * ```
+ *
+ * The `errorMessage.type` expression can be a string value or it can be an array so
+ * that multiple errors can be associated with a single error message:
+ *
+ * ```html
+ *   <label>
+ *     Email address
+ *     <input type="email"
+ *            ng-model="data.email"
+ *            name="myEmail"
+ *            ng-minlength="5"
+ *            ng-maxlength="100"
+ *            required />
+ *   </label>
+ *   <div ng-messages="myForm.myEmail.$error" role="alert">
+ *     <div ng-message-exp="'required'">You did not enter your email address</div>
+ *     <div ng-message-exp="['minlength', 'maxlength']">
+ *       Your email must be between 5 and 100 characters long
+ *     </div>
+ *   </div>
+ * ```
+ *
+ * Feel free to use other structural directives such as ng-if and ng-switch to further control
+ * what messages are active and when. Be careful, if you place ng-message on the same element
+ * as these structural directives, Angular may not be able to determine if a message is active
+ * or not. Therefore it is best to place the ng-message on a child element of the structural
+ * directive.
+ *
+ * ```html
+ * <div ng-messages="myForm.myEmail.$error" role="alert">
+ *   <div ng-if="showRequiredError">
+ *     <div ng-message="required">Please enter something</div>
+ *   </div>
+ * </div>
+ * ```
+ *
  * ## Animations
- * If the `ngAnimate` module is active within the application then both the `ngMessages` and
- * `ngMessage` directives will trigger animations whenever any messages are added and removed
- * from the DOM by the `ngMessages` directive.
+ * If the `ngAnimate` module is active within the application then the `ngMessages`, `ngMessage` and
+ * `ngMessageExp` directives will trigger animations whenever any messages are added and removed from
+ * the DOM by the `ngMessages` directive.
  *
  * Whenever the `ngMessages` directive contains one or more visible messages then the `.ng-active` CSS
  * class will be added to the element. The `.ng-inactive` CSS class will be applied when there are no
@@ -115,7 +202,7 @@
  * Let's say that our HTML code for our messages container looks like so:
  *
  * ```html
- * <div ng-messages="myMessages" class="my-messages">
+ * <div ng-messages="myMessages" class="my-messages" role="alert">
  *   <div ng-message="alert" class="some-message">...</div>
  *   <div ng-message="fail" class="some-message">...</div>
  * </div>
@@ -164,14 +251,14 @@ angular.module('ngMessages', [])
     *
     * @description
     * `ngMessages` is a directive that is designed to show and hide messages based on the state
-    * of a key/value object that it listens on. The directive itself compliments error message
+    * of a key/value object that it listens on. The directive itself complements error message
     * reporting with the `ngModel` $error object (which stores a key/value state of validation errors).
     *
     * `ngMessages` manages the state of internal messages within its container element. The internal
     * messages use the `ngMessage` directive and will be inserted/removed from the page depending
     * on if they're present within the key/value object. By default, only one message will be displayed
     * at a time and this depends on the prioritization of the messages within the template. (This can
-    * be changed by using the ng-messages-multiple on the directive container.)
+    * be changed by using the `ng-messages-multiple` or `multiple` attribute on the directive container.)
     *
     * A remote template can also be used to promote message reusability and messages can also be
     * overridden.
@@ -181,24 +268,23 @@ angular.module('ngMessages', [])
     * @usage
     * ```html
     * <!-- using attribute directives -->
-    * <ANY ng-messages="expression">
-    *   <ANY ng-message="keyValue1">...</ANY>
-    *   <ANY ng-message="keyValue2">...</ANY>
-    *   <ANY ng-message="keyValue3">...</ANY>
+    * <ANY ng-messages="expression" role="alert">
+    *   <ANY ng-message="stringValue">...</ANY>
+    *   <ANY ng-message="stringValue1, stringValue2, ...">...</ANY>
+    *   <ANY ng-message-exp="expressionValue">...</ANY>
     * </ANY>
     *
     * <!-- or by using element directives -->
-    * <ng-messages for="expression">
-    *   <ng-message when="keyValue1">...</ng-message>
-    *   <ng-message when="keyValue2">...</ng-message>
-    *   <ng-message when="keyValue3">...</ng-message>
+    * <ng-messages for="expression" role="alert">
+    *   <ng-message when="stringValue">...</ng-message>
+    *   <ng-message when="stringValue1, stringValue2, ...">...</ng-message>
+    *   <ng-message when-exp="expressionValue">...</ng-message>
     * </ng-messages>
     * ```
     *
     * @param {string} ngMessages an angular expression evaluating to a key/value object
     *                 (this is typically the $error object on an ngModel instance).
     * @param {string=} ngMessagesMultiple|multiple when set, all messages will be displayed with true
-    * @param {string=} ngMessagesInclude|include when set, the specified template will be included into the ng-messages container
     *
     * @example
     * <example name="ngMessages-directive" module="ngMessagesExample"
@@ -206,17 +292,18 @@ angular.module('ngMessages', [])
     *          animations="true" fixBase="true">
     *   <file name="index.html">
     *     <form name="myForm">
-    *       <label>Enter your name:</label>
-    *       <input type="text"
-    *              name="myName"
-    *              ng-model="name"
-    *              ng-minlength="5"
-    *              ng-maxlength="20"
-    *              required />
-    *
+    *       <label>
+    *         Enter your name:
+    *         <input type="text"
+    *                name="myName"
+    *                ng-model="name"
+    *                ng-minlength="5"
+    *                ng-maxlength="20"
+    *                required />
+    *       </label>
     *       <pre>myForm.myName.$error = {{ myForm.myName.$error | json }}</pre>
     *
-    *       <div ng-messages="myForm.myName.$error" style="color:maroon">
+    *       <div ng-messages="myForm.myName.$error" style="color:maroon" role="alert">
     *         <div ng-message="required">You did not enter a field</div>
     *         <div ng-message="minlength">Your field is too short</div>
     *         <div ng-message="maxlength">Your field is too long</div>
@@ -228,91 +315,220 @@ angular.module('ngMessages', [])
     *   </file>
     * </example>
     */
-  .directive('ngMessages', ['$compile', '$animate', '$templateRequest',
-                   function($compile,    $animate,   $templateRequest) {
-    var ACTIVE_CLASS = 'ng-active';
-    var INACTIVE_CLASS = 'ng-inactive';
+   .directive('ngMessages', ['$animate', function($animate) {
+     var ACTIVE_CLASS = 'ng-active';
+     var INACTIVE_CLASS = 'ng-inactive';
 
-    return {
-      restrict: 'AE',
-      controller: function() {
-        this.$renderNgMessageClasses = angular.noop;
-
-        var messages = [];
-        this.registerMessage = function(index, message) {
-          for (var i = 0; i < messages.length; i++) {
-            if (messages[i].type == message.type) {
-              if (index != i) {
-                var temp = messages[index];
-                messages[index] = messages[i];
-                if (index < messages.length) {
-                  messages[i] = temp;
-                } else {
-                  messages.splice(0, i); //remove the old one (and shift left)
-                }
-              }
-              return;
-            }
-          }
-          messages.splice(index, 0, message); //add the new one (and shift right)
-        };
+     return {
+       require: 'ngMessages',
+       restrict: 'AE',
+       controller: ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
+         var ctrl = this;
+         var latestKey = 0;
 
-        this.renderMessages = function(values, multiple) {
-          values = values || {};
+         var messages = this.messages = {};
+         var renderLater, cachedCollection;
 
-          var found;
-          angular.forEach(messages, function(message) {
-            if ((!found || multiple) && truthyVal(values[message.type])) {
-              message.attach();
-              found = true;
-            } else {
-              message.detach();
-            }
-          });
+         this.render = function(collection) {
+           collection = collection || {};
 
-          this.renderElementClasses(found);
+           renderLater = false;
+           cachedCollection = collection;
 
-          function truthyVal(value) {
-            return value !== null && value !== false && value;
-          }
-        };
-      },
-      require: 'ngMessages',
-      link: function($scope, element, $attrs, ctrl) {
-        ctrl.renderElementClasses = function(bool) {
-          bool ? $animate.setClass(element, ACTIVE_CLASS, INACTIVE_CLASS)
-               : $animate.setClass(element, INACTIVE_CLASS, ACTIVE_CLASS);
-        };
+           // this is true if the attribute is empty or if the attribute value is truthy
+           var multiple = isAttrTruthy($scope, $attrs.ngMessagesMultiple) ||
+                          isAttrTruthy($scope, $attrs.multiple);
 
-        //JavaScript treats empty strings as false, but ng-message-multiple by itself is an empty string
-        var multiple = angular.isString($attrs.ngMessagesMultiple) ||
-                       angular.isString($attrs.multiple);
+           var unmatchedMessages = [];
+           var matchedKeys = {};
+           var messageItem = ctrl.head;
+           var messageFound = false;
+           var totalMessages = 0;
 
-        var cachedValues, watchAttr = $attrs.ngMessages || $attrs['for']; //for is a reserved keyword
-        $scope.$watchCollection(watchAttr, function(values) {
-          cachedValues = values;
-          ctrl.renderMessages(values, multiple);
-        });
+           // we use != instead of !== to allow for both undefined and null values
+           while (messageItem != null) {
+             totalMessages++;
+             var messageCtrl = messageItem.message;
 
-        var tpl = $attrs.ngMessagesInclude || $attrs.include;
-        if (tpl) {
-          $templateRequest(tpl)
-            .then(function processTemplate(html) {
-              var after, container = angular.element('<div/>').html(html);
-              angular.forEach(container.children(), function(elm) {
-               elm = angular.element(elm);
-               after ? after.after(elm)
-                     : element.prepend(elm); //start of the container
-               after = elm;
-               $compile(elm)($scope);
-              });
-              ctrl.renderMessages(cachedValues, multiple);
-            });
-        }
-      }
-    };
-  }])
+             var messageUsed = false;
+             if (!messageFound) {
+               forEach(collection, function(value, key) {
+                 if (!messageUsed && truthy(value) && messageCtrl.test(key)) {
+                   // this is to prevent the same error name from showing up twice
+                   if (matchedKeys[key]) return;
+                   matchedKeys[key] = true;
+
+                   messageUsed = true;
+                   messageCtrl.attach();
+                 }
+               });
+             }
+
+             if (messageUsed) {
+               // unless we want to display multiple messages then we should
+               // set a flag here to avoid displaying the next message in the list
+               messageFound = !multiple;
+             } else {
+               unmatchedMessages.push(messageCtrl);
+             }
+
+             messageItem = messageItem.next;
+           }
+
+           forEach(unmatchedMessages, function(messageCtrl) {
+             messageCtrl.detach();
+           });
+
+           unmatchedMessages.length !== totalMessages
+              ? $animate.setClass($element, ACTIVE_CLASS, INACTIVE_CLASS)
+              : $animate.setClass($element, INACTIVE_CLASS, ACTIVE_CLASS);
+         };
+
+         $scope.$watchCollection($attrs.ngMessages || $attrs['for'], ctrl.render);
+
+         this.reRender = function() {
+           if (!renderLater) {
+             renderLater = true;
+             $scope.$evalAsync(function() {
+               if (renderLater) {
+                 cachedCollection && ctrl.render(cachedCollection);
+               }
+             });
+           }
+         };
+
+         this.register = function(comment, messageCtrl) {
+           var nextKey = latestKey.toString();
+           messages[nextKey] = {
+             message: messageCtrl
+           };
+           insertMessageNode($element[0], comment, nextKey);
+           comment.$$ngMessageNode = nextKey;
+           latestKey++;
+
+           ctrl.reRender();
+         };
+
+         this.deregister = function(comment) {
+           var key = comment.$$ngMessageNode;
+           delete comment.$$ngMessageNode;
+           removeMessageNode($element[0], comment, key);
+           delete messages[key];
+           ctrl.reRender();
+         };
+
+         function findPreviousMessage(parent, comment) {
+           var prevNode = comment;
+           var parentLookup = [];
+           while (prevNode && prevNode !== parent) {
+             var prevKey = prevNode.$$ngMessageNode;
+             if (prevKey && prevKey.length) {
+               return messages[prevKey];
+             }
+
+             // dive deeper into the DOM and examine its children for any ngMessage
+             // comments that may be in an element that appears deeper in the list
+             if (prevNode.childNodes.length && parentLookup.indexOf(prevNode) == -1) {
+               parentLookup.push(prevNode);
+               prevNode = prevNode.childNodes[prevNode.childNodes.length - 1];
+             } else {
+               prevNode = prevNode.previousSibling || prevNode.parentNode;
+             }
+           }
+         }
+
+         function insertMessageNode(parent, comment, key) {
+           var messageNode = messages[key];
+           if (!ctrl.head) {
+             ctrl.head = messageNode;
+           } else {
+             var match = findPreviousMessage(parent, comment);
+             if (match) {
+               messageNode.next = match.next;
+               match.next = messageNode;
+             } else {
+               messageNode.next = ctrl.head;
+               ctrl.head = messageNode;
+             }
+           }
+         }
+
+         function removeMessageNode(parent, comment, key) {
+           var messageNode = messages[key];
+
+           var match = findPreviousMessage(parent, comment);
+           if (match) {
+             match.next = messageNode.next;
+           } else {
+             ctrl.head = messageNode.next;
+           }
+         }
+       }]
+     };
+
+     function isAttrTruthy(scope, attr) {
+      return (isString(attr) && attr.length === 0) || //empty attribute
+             truthy(scope.$eval(attr));
+     }
 
+     function truthy(val) {
+       return isString(val) ? val.length : !!val;
+     }
+   }])
+
+   /**
+    * @ngdoc directive
+    * @name ngMessagesInclude
+    * @restrict AE
+    * @scope
+    *
+    * @description
+    * `ngMessagesInclude` is a directive with the purpose to import existing ngMessage template
+    * code from a remote template and place the downloaded template code into the exact spot
+    * that the ngMessagesInclude directive is placed within the ngMessages container. This allows
+    * for a series of pre-defined messages to be reused and also allows for the developer to
+    * determine what messages are overridden due to the placement of the ngMessagesInclude directive.
+    *
+    * @usage
+    * ```html
+    * <!-- using attribute directives -->
+    * <ANY ng-messages="expression" role="alert">
+    *   <ANY ng-messages-include="remoteTplString">...</ANY>
+    * </ANY>
+    *
+    * <!-- or by using element directives -->
+    * <ng-messages for="expression" role="alert">
+    *   <ng-messages-include src="expressionValue1">...</ng-messages-include>
+    * </ng-messages>
+    * ```
+    *
+    * {@link module:ngMessages Click here} to learn more about `ngMessages` and `ngMessage`.
+    *
+    * @param {string} ngMessagesInclude|src a string value corresponding to the remote template.
+    */
+   .directive('ngMessagesInclude',
+     ['$templateRequest', '$document', '$compile', function($templateRequest, $document, $compile) {
+
+     return {
+       restrict: 'AE',
+       require: '^^ngMessages', // we only require this for validation sake
+       link: function($scope, element, attrs) {
+         var src = attrs.ngMessagesInclude || attrs.src;
+         $templateRequest(src).then(function(html) {
+           $compile(html)($scope, function(contents) {
+             element.after(contents);
+
+             // the anchor is placed for debugging purposes
+             var anchor = jqLite($document[0].createComment(' ngMessagesInclude: ' + src + ' '));
+             element.after(anchor);
+
+             // we don't want to pollute the DOM anymore by keeping an empty directive element
+             element.remove();
+           });
+         });
+       }
+     };
+   }])
 
    /**
     * @ngdoc directive
@@ -326,67 +542,129 @@ angular.module('ngMessages', [])
     * must be situated since it determines which messages are visible based on the state
     * of the provided key/value map that `ngMessages` listens on.
     *
+    * More information about using `ngMessage` can be found in the
+    * {@link module:ngMessages `ngMessages` module documentation}.
+    *
+    * @usage
+    * ```html
+    * <!-- using attribute directives -->
+    * <ANY ng-messages="expression" role="alert">
+    *   <ANY ng-message="stringValue">...</ANY>
+    *   <ANY ng-message="stringValue1, stringValue2, ...">...</ANY>
+    * </ANY>
+    *
+    * <!-- or by using element directives -->
+    * <ng-messages for="expression" role="alert">
+    *   <ng-message when="stringValue">...</ng-message>
+    *   <ng-message when="stringValue1, stringValue2, ...">...</ng-message>
+    * </ng-messages>
+    * ```
+    *
+    * @param {expression} ngMessage|when a string value corresponding to the message key.
+    */
+  .directive('ngMessage', ngMessageDirectiveFactory('AE'))
+
+
+   /**
+    * @ngdoc directive
+    * @name ngMessageExp
+    * @restrict AE
+    * @scope
+    *
+    * @description
+    * `ngMessageExp` is a directive with the purpose to show and hide a particular message.
+    * For `ngMessageExp` to operate, a parent `ngMessages` directive on a parent DOM element
+    * must be situated since it determines which messages are visible based on the state
+    * of the provided key/value map that `ngMessages` listens on.
+    *
     * @usage
     * ```html
     * <!-- using attribute directives -->
     * <ANY ng-messages="expression">
-    *   <ANY ng-message="keyValue1">...</ANY>
-    *   <ANY ng-message="keyValue2">...</ANY>
-    *   <ANY ng-message="keyValue3">...</ANY>
+    *   <ANY ng-message-exp="expressionValue">...</ANY>
     * </ANY>
     *
     * <!-- or by using element directives -->
     * <ng-messages for="expression">
-    *   <ng-message when="keyValue1">...</ng-message>
-    *   <ng-message when="keyValue2">...</ng-message>
-    *   <ng-message when="keyValue3">...</ng-message>
+    *   <ng-message when-exp="expressionValue">...</ng-message>
     * </ng-messages>
     * ```
     *
     * {@link module:ngMessages Click here} to learn more about `ngMessages` and `ngMessage`.
     *
-    * @param {string} ngMessage a string value corresponding to the message key.
+    * @param {expression} ngMessageExp|whenExp an expression value corresponding to the message key.
     */
-  .directive('ngMessage', ['$animate', function($animate) {
-    var COMMENT_NODE = 8;
+  .directive('ngMessageExp', ngMessageDirectiveFactory('A'));
+
+function ngMessageDirectiveFactory(restrict) {
+  return ['$animate', function($animate) {
     return {
-      require: '^ngMessages',
+      restrict: 'AE',
       transclude: 'element',
       terminal: true,
-      restrict: 'AE',
-      link: function($scope, $element, $attrs, ngMessages, $transclude) {
-        var index, element;
-
-        var commentNode = $element[0];
-        var parentNode = commentNode.parentNode;
-        for (var i = 0, j = 0; i < parentNode.childNodes.length; i++) {
-          var node = parentNode.childNodes[i];
-          if (node.nodeType == COMMENT_NODE && node.nodeValue.indexOf('ngMessage') >= 0) {
-            if (node === commentNode) {
-              index = j;
-              break;
-            }
-            j++;
-          }
+      require: '^^ngMessages',
+      link: function(scope, element, attrs, ngMessagesCtrl, $transclude) {
+        var commentNode = element[0];
+
+        var records;
+        var staticExp = attrs.ngMessage || attrs.when;
+        var dynamicExp = attrs.ngMessageExp || attrs.whenExp;
+        var assignRecords = function(items) {
+          records = items
+              ? (isArray(items)
+                    ? items
+                    : items.split(/[\s,]+/))
+              : null;
+          ngMessagesCtrl.reRender();
+        };
+
+        if (dynamicExp) {
+          assignRecords(scope.$eval(dynamicExp));
+          scope.$watchCollection(dynamicExp, assignRecords);
+        } else {
+          assignRecords(staticExp);
         }
 
-        ngMessages.registerMessage(index, {
-          type: $attrs.ngMessage || $attrs.when,
+        var currentElement, messageCtrl;
+        ngMessagesCtrl.register(commentNode, messageCtrl = {
+          test: function(name) {
+            return contains(records, name);
+          },
           attach: function() {
-            if (!element) {
-              $transclude($scope, function(clone) {
-                $animate.enter(clone, null, $element);
-                element = clone;
+            if (!currentElement) {
+              $transclude(scope, function(elm) {
+                $animate.enter(elm, null, element);
+                currentElement = elm;
+
+                // in the event that the parent element is destroyed
+                // by any other structural directive then it's time
+                // to deregister the message from the controller
+                currentElement.on('$destroy', function() {
+                  if (currentElement) {
+                    ngMessagesCtrl.deregister(commentNode);
+                    messageCtrl.detach();
+                  }
+                });
               });
             }
           },
           detach: function() {
-            if (element) {
-              $animate.leave(element);
-              element = null;
+            if (currentElement) {
+              var elm = currentElement;
+              currentElement = null;
+              $animate.leave(elm);
             }
           }
         });
       }
     };
-  }]);
+  }];
+
+  function contains(collection, key) {
+    if (collection) {
+      return isArray(collection)
+          ? collection.indexOf(key) >= 0
+          : collection.hasOwnProperty(key);
+    }
+  }
+}
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index dcefe12008ca..12fb19c40b31 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -57,10 +57,9 @@ angular.mock.$Browser = function() {
     return listener;
   };
 
+  self.$$applicationDestroyed = angular.noop;
   self.$$checkUrlChange = angular.noop;
 
-  self.cookieHash = {};
-  self.lastCookieHash = {};
   self.deferredFns = [];
   self.deferredNextId = 0;
 
@@ -140,11 +139,6 @@ angular.mock.$Browser.prototype = {
     });
   },
 
-  addPollFn: function(pollFn) {
-    this.pollFns.push(pollFn);
-    return pollFn;
-  },
-
   url: function(url, replace, state) {
     if (angular.isUndefined(state)) {
       state = null;
@@ -163,25 +157,6 @@ angular.mock.$Browser.prototype = {
     return this.$$state;
   },
 
-  cookies:  function(name, value) {
-    if (name) {
-      if (angular.isUndefined(value)) {
-        delete this.cookieHash[name];
-      } else {
-        if (angular.isString(value) &&       //strings only
-            value.length <= 4096) {          //strict cookie storage limits
-          this.cookieHash[name] = value;
-        }
-      }
-    } else {
-      if (!angular.equals(this.cookieHash, this.lastCookieHash)) {
-        this.lastCookieHash = angular.copy(this.cookieHash);
-        this.cookieHash = angular.copy(this.cookieHash);
-      }
-      return this.cookieHash;
-    }
-  },
-
   notifyWhenNoOutstandingRequests: function(fn) {
     fn();
   }
@@ -451,6 +426,7 @@ angular.mock.$LogProvider = function() {
  *   indefinitely.
  * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
  *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+ * @param {...*=} Pass additional parameters to the executed function.
  * @returns {promise} A promise which will be notified on each iteration.
  */
 angular.mock.$IntervalProvider = function() {
@@ -461,13 +437,17 @@ angular.mock.$IntervalProvider = function() {
         now = 0;
 
     var $interval = function(fn, delay, count, invokeApply) {
-      var iteration = 0,
+      var hasParams = arguments.length > 4,
+          args = hasParams ? Array.prototype.slice.call(arguments, 4) : [],
+          iteration = 0,
           skipApply = (angular.isDefined(invokeApply) && !invokeApply),
           deferred = (skipApply ? $$q : $q).defer(),
           promise = deferred.promise;
 
       count = (angular.isDefined(count)) ? count : 0;
-      promise.then(null, null, fn);
+      promise.then(null, null, (!hasParams) ? fn : function() {
+        fn.apply(null, args);
+      });
 
       promise.$$intervalId = nextRepeatId;
 
@@ -775,23 +755,26 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
 
   .config(['$provide', function($provide) {
 
-    var reflowQueue = [];
-    $provide.value('$$animateReflow', function(fn) {
-      var index = reflowQueue.length;
-      reflowQueue.push(fn);
-      return function cancel() {
-        reflowQueue.splice(index, 1);
-      };
+    $provide.factory('$$forceReflow', function() {
+      function reflowFn() {
+        reflowFn.totalReflows++;
+      }
+      reflowFn.totalReflows = 0;
+      return reflowFn;
     });
 
-    $provide.decorator('$animate', ['$delegate', '$$asyncCallback', '$timeout', '$browser',
-                            function($delegate,   $$asyncCallback,   $timeout,   $browser) {
+    $provide.decorator('$animate', ['$delegate', '$timeout', '$browser', '$$rAF', '$$forceReflow',
+                            function($delegate,   $timeout,   $browser,   $$rAF,   $$forceReflow) {
+
       var animate = {
         queue: [],
         cancel: $delegate.cancel,
+        get reflows() {
+          return $$forceReflow.totalReflows;
+        },
         enabled: $delegate.enabled,
         triggerCallbackEvents: function() {
-          $$asyncCallback.flush();
+          $$rAF.flush();
         },
         triggerCallbackPromise: function() {
           $timeout.flush(0);
@@ -799,12 +782,6 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
         triggerCallbacks: function() {
           this.triggerCallbackEvents();
           this.triggerCallbackPromise();
-        },
-        triggerReflow: function() {
-          angular.forEach(reflowQueue, function(fn) {
-            fn();
-          });
-          reflowQueue = [];
         }
       };
 
@@ -1102,7 +1079,7 @@ angular.mock.dump = function(object) {
          $httpBackend.flush();
 
          $httpBackend.expectPOST('/add-msg.py', undefined, function(headers) {
-           // check if the header was send, if it wasn't the expectation won't
+           // check if the header was sent, if it wasn't the expectation won't
            // match the request and the test will fail
            return headers['Authorization'] == 'xxx';
          }).respond(201, '');
@@ -1777,26 +1754,12 @@ angular.mock.$RAFDecorator = ['$delegate', function($delegate) {
       queue[i]();
     }
 
-    queue = [];
+    queue = queue.slice(i);
   };
 
   return rafFn;
 }];
 
-angular.mock.$AsyncCallbackDecorator = ['$delegate', function($delegate) {
-  var callbacks = [];
-  var addFn = function(fn) {
-    callbacks.push(fn);
-  };
-  addFn.flush = function() {
-    angular.forEach(callbacks, function(fn) {
-      fn();
-    });
-    callbacks = [];
-  };
-  return addFn;
-}];
-
 /**
  *
  */
@@ -1806,6 +1769,77 @@ angular.mock.$RootElementProvider = function() {
   };
 };
 
+/**
+ * @ngdoc service
+ * @name $controller
+ * @description
+ * A decorator for {@link ng.$controller} with additional `bindings` parameter, useful when testing
+ * controllers of directives that use {@link $compile#-bindtocontroller- `bindToController`}.
+ *
+ *
+ * ## Example
+ *
+ * ```js
+ *
+ * // Directive definition ...
+ *
+ * myMod.directive('myDirective', {
+ *   controller: 'MyDirectiveController',
+ *   bindToController: {
+ *     name: '@'
+ *   }
+ * });
+ *
+ *
+ * // Controller definition ...
+ *
+ * myMod.controller('MyDirectiveController', ['log', function($log) {
+ *   $log.info(this.name);
+ * })];
+ *
+ *
+ * // In a test ...
+ *
+ * describe('myDirectiveController', function() {
+ *   it('should write the bound name to the log', inject(function($controller, $log) {
+ *     var ctrl = $controller('MyDirective', { /* no locals &#42;/ }, { name: 'Clark Kent' });
+ *     expect(ctrl.name).toEqual('Clark Kent');
+ *     expect($log.info.logs).toEqual(['Clark Kent']);
+ *   });
+ * });
+ *
+ * ```
+ *
+ * @param {Function|string} constructor If called with a function then it's considered to be the
+ *    controller constructor function. Otherwise it's considered to be a string which is used
+ *    to retrieve the controller constructor using the following steps:
+ *
+ *    * check if a controller with given name is registered via `$controllerProvider`
+ *    * check if evaluating the string on the current scope returns a constructor
+ *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
+ *      `window` object (not recommended)
+ *
+ *    The string can use the `controller as property` syntax, where the controller instance is published
+ *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
+ *    to work correctly.
+ *
+ * @param {Object} locals Injection locals for Controller.
+ * @param {Object=} bindings Properties to add to the controller before invoking the constructor. This is used
+ *                           to simulate the `bindToController` feature and simplify certain kinds of tests.
+ * @return {Object} Instance of given controller.
+ */
+angular.mock.$ControllerDecorator = ['$delegate', function($delegate) {
+  return function(expression, locals, later, ident) {
+    if (later && typeof later === 'object') {
+      var create = $delegate(expression, locals, true, ident);
+      angular.extend(create.instance, later);
+      return create();
+    }
+    return $delegate(expression, locals, later, ident);
+  };
+}];
+
+
 /**
  * @ngdoc module
  * @name ngMock
@@ -1832,8 +1866,8 @@ angular.module('ngMock', ['ng']).provider({
 }).config(['$provide', function($provide) {
   $provide.decorator('$timeout', angular.mock.$TimeoutDecorator);
   $provide.decorator('$$rAF', angular.mock.$RAFDecorator);
-  $provide.decorator('$$asyncCallback', angular.mock.$AsyncCallbackDecorator);
   $provide.decorator('$rootScope', angular.mock.$RootScopeDecorator);
+  $provide.decorator('$controller', angular.mock.$ControllerDecorator);
 }]);
 
 /**
@@ -2169,7 +2203,6 @@ if (window.jasmine || window.mocha) {
 
     if (injector) {
       injector.get('$rootElement').off();
-      injector.get('$browser').pollFns.length = 0;
     }
 
     // clean up jquery's fragment cache
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
index e916de8351dd..7ff32e83f17e 100644
--- a/src/ngResource/resource.js
+++ b/src/ngResource/resource.js
@@ -5,7 +5,7 @@ var $resourceMinErr = angular.$$minErr('$resource');
 // Helper functions and regex to lookup a dotted path on an object
 // stopping at undefined/null.  The path must be composed of ASCII
 // identifiers (just like $parse)
-var MEMBER_NAME_REGEX = /^(\.[a-zA-Z_$][0-9a-zA-Z_$]*)+$/;
+var MEMBER_NAME_REGEX = /^(\.[a-zA-Z_$@][0-9a-zA-Z_$@]*)+$/;
 
 function isValidDottedPath(path) {
   return (path != null && path !== '' && path !== 'hasOwnProperty' &&
@@ -85,7 +85,7 @@ function shallowClearAndCopy(src, dst) {
      }]);
  * ```
  *
- * @param {string} url A parametrized URL template with parameters prefixed by `:` as in
+ * @param {string} url A parameterized URL template with parameters prefixed by `:` as in
  *   `/user/:username`. If you are using a URL with a port number (e.g.
  *   `http://example.com:8080/api`), it will be respected.
  *
@@ -208,7 +208,9 @@ function shallowClearAndCopy(src, dst) {
  *   - non-GET "class" actions: `Resource.action([parameters], postData, [success], [error])`
  *   - non-GET instance actions:  `instance.$action([parameters], [success], [error])`
  *
- *   Success callback is called with (value, responseHeaders) arguments. Error callback is called
+ *
+ *   Success callback is called with (value, responseHeaders) arguments, where the value is
+ *   the populated resource instance or collection object. The error callback is called
  *   with (httpResponse) argument.
  *
  *   Class actions return empty instance (with additional properties below).
@@ -560,8 +562,10 @@ angular.module('ngResource', ['ng']).
               undefined;
 
             forEach(action, function(value, key) {
-              if (key != 'params' && key != 'isArray' && key != 'interceptor') {
+              if (key != 'params' && key != 'isArray' && key != 'interceptor' && key != 'timeout') {
                 httpConfig[key] = copy(value);
+              } else if (key == 'timeout') {
+                httpConfig[key] = value;
               }
             });
 
@@ -580,8 +584,8 @@ angular.module('ngResource', ['ng']).
                 if (angular.isArray(data) !== (!!action.isArray)) {
                   throw $resourceMinErr('badcfg',
                       'Error in resource configuration for action `{0}`. Expected response to ' +
-                      'contain an {1} but got an {2}', name, action.isArray ? 'array' : 'object',
-                    angular.isArray(data) ? 'array' : 'object');
+                      'contain an {1} but got an {2} (Request: {3} {4})', name, action.isArray ? 'array' : 'object',
+                    angular.isArray(data) ? 'array' : 'object', httpConfig.method, httpConfig.url);
                 }
                 // jshint +W018
                 if (action.isArray) {
diff --git a/src/ngRoute/route.js b/src/ngRoute/route.js
index 1826dac3d6df..1842948b1737 100644
--- a/src/ngRoute/route.js
+++ b/src/ngRoute/route.js
@@ -407,7 +407,9 @@ function $RouteProvider() {
      * @name $route#$routeChangeSuccess
      * @eventType broadcast on root scope
      * @description
-     * Broadcasted after a route dependencies are resolved.
+     * Broadcasted after a route change has happened successfully.
+     * The `resolve` dependencies are now available in the `current.locals` property.
+     *
      * {@link ngRoute.directive:ngView ngView} listens for the directive
      * to instantiate the controller and render the view.
      *
@@ -435,9 +437,11 @@ function $RouteProvider() {
      * @name $route#$routeUpdate
      * @eventType broadcast on root scope
      * @description
-     *
      * The `reloadOnSearch` property has been set to false, and we are reusing the same
      * instance of the Controller.
+     *
+     * @param {Object} angularEvent Synthetic event object
+     * @param {Route} current Current/previous route information.
      */
 
     var forceReload = false,
@@ -589,9 +593,8 @@ function $RouteProvider() {
                 if (angular.isFunction(templateUrl)) {
                   templateUrl = templateUrl(nextRoute.params);
                 }
-                templateUrl = $sce.getTrustedResourceUrl(templateUrl);
                 if (angular.isDefined(templateUrl)) {
-                  nextRoute.loadedTemplateUrl = templateUrl;
+                  nextRoute.loadedTemplateUrl = $sce.valueOf(templateUrl);
                   template = $templateRequest(templateUrl);
                 }
               }
diff --git a/src/ngSanitize/filter/linky.js b/src/ngSanitize/filter/linky.js
index e0be704f9c2c..159958e9876c 100644
--- a/src/ngSanitize/filter/linky.js
+++ b/src/ngSanitize/filter/linky.js
@@ -104,8 +104,8 @@
  */
 angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
   var LINKY_URL_REGEXP =
-        /((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"”’]/,
-      MAILTO_REGEXP = /^mailto:/;
+        /((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
+      MAILTO_REGEXP = /^mailto:/i;
 
   return function(text, target) {
     if (!text) return text;
diff --git a/src/ngSanitize/sanitize.js b/src/ngSanitize/sanitize.js
index 50210fea05c1..4c7f615dc7d1 100644
--- a/src/ngSanitize/sanitize.js
+++ b/src/ngSanitize/sanitize.js
@@ -1,5 +1,16 @@
 'use strict';
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 var $sanitizeMinErr = angular.$$minErr('$sanitize');
 
 /**
@@ -195,10 +206,11 @@ var inlineElements = angular.extend({}, optionalEndTagInlineElements, makeMap("a
 
 // SVG Elements
 // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Elements
-var svgElements = makeMap("animate,animateColor,animateMotion,animateTransform,circle,defs," +
-        "desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,hkern,image,linearGradient," +
-        "line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,radialGradient,rect,set," +
-        "stop,svg,switch,text,title,tspan,use");
+// Note: the elements animate,animateColor,animateMotion,animateTransform,set are intentionally omitted.
+// They can potentially allow for arbitrary javascript to be executed. See #11290
+var svgElements = makeMap("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph," +
+        "hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline," +
+        "radialGradient,rect,stop,svg,switch,text,title,tspan,use");
 
 // Special Elements (can contain anything)
 var specialElements = makeMap("script,style");
@@ -216,36 +228,37 @@ var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap,xlink:href");
 var htmlAttrs = makeMap('abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' +
     'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' +
     'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' +
-    'scope,scrolling,shape,size,span,start,summary,target,title,type,' +
+    'scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,' +
     'valign,value,vspace,width');
 
 // SVG attributes (without "id" and "name" attributes)
 // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Attributes
 var svgAttrs = makeMap('accent-height,accumulate,additive,alphabetic,arabic-form,ascent,' +
-    'attributeName,attributeType,baseProfile,bbox,begin,by,calcMode,cap-height,class,color,' +
-    'color-rendering,content,cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,' +
-    'font-size,font-stretch,font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,' +
-    'gradientUnits,hanging,height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,' +
-    'keySplines,keyTimes,lang,marker-end,marker-mid,marker-start,markerHeight,markerUnits,' +
-    'markerWidth,mathematical,max,min,offset,opacity,orient,origin,overline-position,' +
-    'overline-thickness,panose-1,path,pathLength,points,preserveAspectRatio,r,refX,refY,' +
-    'repeatCount,repeatDur,requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,' +
-    'stemv,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,stroke,' +
-    'stroke-dasharray,stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,' +
-    'stroke-opacity,stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,' +
-    'underline-position,underline-thickness,unicode,unicode-range,units-per-em,values,version,' +
-    'viewBox,visibility,width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,' +
-    'xlink:show,xlink:title,xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,' +
-    'zoomAndPan');
+    'baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,' +
+    'cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,' +
+    'font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,' +
+    'height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,' +
+    'marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,' +
+    'max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,' +
+    'path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,' +
+    'requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,' +
+    'stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,' +
+    'stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,' +
+    'stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,' +
+    'underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,' +
+    'width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,' +
+    'xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan', true);
 
 var validAttrs = angular.extend({},
                                 uriAttrs,
                                 svgAttrs,
                                 htmlAttrs);
 
-function makeMap(str) {
+function makeMap(str, lowercaseKeys) {
   var obj = {}, items = str.split(','), i;
-  for (i = 0; i < items.length; i++) obj[items[i]] = true;
+  for (i = 0; i < items.length; i++) {
+    obj[lowercaseKeys ? angular.lowercase(items[i]) : items[i]] = true;
+  }
   return obj;
 }
 
@@ -413,7 +426,6 @@ function htmlParser(html, handler) {
 }
 
 var hiddenPre=document.createElement("pre");
-var spaceRe = /^(\s*)([\s\S]*?)(\s*)$/;
 /**
  * decodes all entities into regular string
  * @param value
@@ -422,22 +434,10 @@ var spaceRe = /^(\s*)([\s\S]*?)(\s*)$/;
 function decodeEntities(value) {
   if (!value) { return ''; }
 
-  // Note: IE8 does not preserve spaces at the start/end of innerHTML
-  // so we must capture them and reattach them afterward
-  var parts = spaceRe.exec(value);
-  var spaceBefore = parts[1];
-  var spaceAfter = parts[3];
-  var content = parts[2];
-  if (content) {
-    hiddenPre.innerHTML=content.replace(/</g,"&lt;");
-    // innerText depends on styling as it doesn't display hidden elements.
-    // Therefore, it's better to use textContent not to cause unnecessary
-    // reflows. However, IE<9 don't support textContent so the innerText
-    // fallback is necessary.
-    content = 'textContent' in hiddenPre ?
-      hiddenPre.textContent : hiddenPre.innerText;
-  }
-  return spaceBefore + content + spaceAfter;
+  hiddenPre.innerHTML = value.replace(/</g,"&lt;");
+  // innerText depends on styling as it doesn't display hidden elements.
+  // Therefore, it's better to use textContent not to cause unnecessary reflows.
+  return hiddenPre.textContent;
 }
 
 /**
diff --git a/src/ngScenario/browserTrigger.js b/src/ngScenario/browserTrigger.js
index 35aa54aad93e..f3c22fe5ff62 100644
--- a/src/ngScenario/browserTrigger.js
+++ b/src/ngScenario/browserTrigger.js
@@ -77,6 +77,8 @@
           evnt.initAnimationEvent(eventType, null, null, null, eventData.elapsedTime || 0);
         }
       }
+    } else if (/touch/.test(eventType) && supportsTouchEvents()) {
+      evnt = createTouchEvent(element, eventType, x, y);
     } else {
       evnt = document.createEvent('MouseEvents');
       x = x || 0;
@@ -112,4 +114,35 @@
 
     return finalProcessDefault;
   };
+
+  function supportsTouchEvents() {
+    if ('_cached' in supportsTouchEvents) {
+      return supportsTouchEvents._cached;
+    }
+    if (!document.createTouch || !document.createTouchList) {
+      supportsTouchEvents._cached = false;
+      return false;
+    }
+    try {
+      document.createEvent('TouchEvent');
+    } catch (e) {
+      supportsTouchEvents._cached = false;
+      return false;
+    }
+    supportsTouchEvents._cached = true;
+    return true;
+  }
+
+  function createTouchEvent(element, eventType, x, y) {
+    var evnt = new Event(eventType);
+    x = x || 0;
+    y = y || 0;
+
+    var touch = document.createTouch(window, element, Date.now(), x, y, x, y);
+    var touches = document.createTouchList(touch);
+
+    evnt.touches = touches;
+
+    return evnt;
+  }
 }());
diff --git a/src/ngTouch/directive/ngClick.js b/src/ngTouch/directive/ngClick.js
index 90274aba7322..f352c252f443 100644
--- a/src/ngTouch/directive/ngClick.js
+++ b/src/ngTouch/directive/ngClick.js
@@ -1,6 +1,8 @@
 'use strict';
 
-/* global ngTouch: false */
+/* global ngTouch: false,
+  nodeName_: false
+*/
 
 /**
  * @ngdoc directive
@@ -66,7 +68,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
   // double-tapping, and then fire a click event.
   //
   // This delay sucks and makes mobile apps feel unresponsive.
-  // So we detect touchstart, touchmove, touchcancel and touchend ourselves and determine when
+  // So we detect touchstart, touchcancel and touchend ourselves and determine when
   // the user has tapped on something.
   //
   // What happens when the browser then generates a click event?
@@ -78,7 +80,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
   // So the sequence for a tap is:
   // - global touchstart: Sets an "allowable region" at the point touched.
   // - element's touchstart: Starts a touch
-  // (- touchmove or touchcancel ends the touch, no click follows)
+  // (- touchcancel ends the touch, no click follows)
   // - element's touchend: Determines if the tap is valid (didn't move too far away, didn't hold
   //   too long) and fires the user's tap handler. The touchend also calls preventGhostClick().
   // - preventGhostClick() removes the allowable region the global touchstart created.
@@ -142,7 +144,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
       lastLabelClickCoordinates = null;
     }
     // remember label click coordinates to prevent click busting of trigger click event on input
-    if (event.target.tagName.toLowerCase() === 'label') {
+    if (nodeName_(event.target) === 'label') {
       lastLabelClickCoordinates = [x, y];
     }
 
@@ -158,7 +160,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
     event.preventDefault();
 
     // Blur focused form elements
-    event.target && event.target.blur();
+    event.target && event.target.blur && event.target.blur();
   }
 
 
@@ -221,16 +223,14 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
 
       startTime = Date.now();
 
-      var touches = event.touches && event.touches.length ? event.touches : [event];
-      var e = touches[0].originalEvent || touches[0];
+      // Use jQuery originalEvent
+      var originalEvent = event.originalEvent || event;
+      var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent];
+      var e = touches[0];
       touchStartX = e.clientX;
       touchStartY = e.clientY;
     });
 
-    element.on('touchmove', function(event) {
-      resetState();
-    });
-
     element.on('touchcancel', function(event) {
       resetState();
     });
@@ -238,9 +238,12 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
     element.on('touchend', function(event) {
       var diff = Date.now() - startTime;
 
-      var touches = (event.changedTouches && event.changedTouches.length) ? event.changedTouches :
-          ((event.touches && event.touches.length) ? event.touches : [event]);
-      var e = touches[0].originalEvent || touches[0];
+      // Use jQuery originalEvent
+      var originalEvent = event.originalEvent || event;
+      var touches = (originalEvent.changedTouches && originalEvent.changedTouches.length) ?
+          originalEvent.changedTouches :
+          ((originalEvent.touches && originalEvent.touches.length) ? originalEvent.touches : [originalEvent]);
+      var e = touches[0];
       var x = e.clientX;
       var y = e.clientY;
       var dist = Math.sqrt(Math.pow(x - touchStartX, 2) + Math.pow(y - touchStartY, 2));
diff --git a/src/ngTouch/swipe.js b/src/ngTouch/swipe.js
index 884e0800d83c..b15628892882 100644
--- a/src/ngTouch/swipe.js
+++ b/src/ngTouch/swipe.js
@@ -40,11 +40,9 @@ ngTouch.factory('$swipe', [function() {
   };
 
   function getCoordinates(event) {
-    var touches = event.touches && event.touches.length ? event.touches : [event];
-    var e = (event.changedTouches && event.changedTouches[0]) ||
-        (event.originalEvent && event.originalEvent.changedTouches &&
-            event.originalEvent.changedTouches[0]) ||
-        touches[0].originalEvent || touches[0];
+    var originalEvent = event.originalEvent || event;
+    var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent];
+    var e = (originalEvent.changedTouches && originalEvent.changedTouches[0]) || touches[0];
 
     return {
       x: e.clientX,
@@ -76,7 +74,8 @@ ngTouch.factory('$swipe', [function() {
      * `$swipe` will listen for `mouse` and `touch` events.
      *
      * The four events are `start`, `move`, `end`, and `cancel`. `start`, `move`, and `end`
-     * receive as a parameter a coordinates object of the form `{ x: 150, y: 310 }`.
+     * receive as a parameter a coordinates object of the form `{ x: 150, y: 310 }` and the raw
+     * `event`. `cancel` receives the raw `event` as its single parameter.
      *
      * `start` is called on either `mousedown` or `touchstart`. After this event, `$swipe` is
      * watching for `touchmove` or `mousemove` events. These events are ignored until the total
diff --git a/src/ngTouch/touch.js b/src/ngTouch/touch.js
index dac7900001b9..8191ff0b753a 100644
--- a/src/ngTouch/touch.js
+++ b/src/ngTouch/touch.js
@@ -22,3 +22,6 @@
 /* global -ngTouch */
 var ngTouch = angular.module('ngTouch', []);
 
+function nodeName_(element) {
+  return angular.lowercase(element.nodeName || (element[0] && element[0].nodeName));
+}
diff --git a/test/.jshintrc b/test/.jshintrc
index 98c963364465..0d85795b3545 100644
--- a/test/.jshintrc
+++ b/test/.jshintrc
@@ -30,6 +30,7 @@
     "nextUid": false,
     "setHashKey": false,
     "extend": false,
+    "merge": false,
     "toInt": false,
     "inherit": false,
     "noop": false,
@@ -142,6 +143,10 @@
     "waitsFor": false,
     "runs": false,
     "dump": false,
+    "they": false,
+    "tthey": false,
+    "xthey": false,
+    "assertCompareNodes": false,
 
     /* e2e */
     "browser": false,
@@ -161,6 +166,7 @@
     "provideLog": false,
     "spyOnlyCallsWithArgs": false,
     "createMockStyleSheet": false,
+    "browserSupportsCssAnimations": false,
     "browserTrigger": false,
     "jqLiteCacheSize": false
   }
diff --git a/test/AngularSpec.js b/test/AngularSpec.js
index 4a94e1720024..fd7f6e43bce3 100644
--- a/test/AngularSpec.js
+++ b/test/AngularSpec.js
@@ -336,7 +336,7 @@ describe('angular', function() {
       expect(hashKey(dst)).not.toEqual(hashKey(src));
     });
 
-    it('should retain the previous $$hashKey', function() {
+    it('should retain the previous $$hashKey when copying object with hashKey', function() {
       var src,dst,h;
       src = {};
       dst = {};
@@ -351,7 +351,21 @@ describe('angular', function() {
       expect(hashKey(dst)).toEqual(h);
     });
 
-    it('should handle circular references when circularRefs is turned on', function() {
+    it('should retain the previous $$hashKey when copying non-object', function() {
+      var dst = {};
+      var h = hashKey(dst);
+
+      copy(null, dst);
+      expect(hashKey(dst)).toEqual(h);
+
+      copy(42, dst);
+      expect(hashKey(dst)).toEqual(h);
+
+      copy(new Date(), dst);
+      expect(hashKey(dst)).toEqual(h);
+    });
+
+    it('should handle circular references', function() {
       var a = {b: {a: null}, self: null, selfs: [null, null, [null]]};
       a.b.a = a;
       a.self = a;
@@ -362,13 +376,75 @@ describe('angular', function() {
 
       expect(aCopy).not.toBe(a);
       expect(aCopy).toBe(aCopy.self);
+      expect(aCopy).toBe(aCopy.selfs[2][0]);
       expect(aCopy.selfs[2]).not.toBe(a.selfs[2]);
+
+      var copyTo = [];
+      aCopy = copy(a, copyTo);
+      expect(aCopy).toBe(copyTo);
+      expect(aCopy).not.toBe(a);
+      expect(aCopy).toBe(aCopy.self);
+    });
+
+    it('should handle objects with multiple references', function() {
+      var b = {};
+      var a = [b, -1, b];
+
+      var aCopy = copy(a);
+      expect(aCopy[0]).not.toBe(a[0]);
+      expect(aCopy[0]).toBe(aCopy[2]);
+
+      var copyTo = [];
+      aCopy = copy(a, copyTo);
+      expect(aCopy).toBe(copyTo);
+      expect(aCopy[0]).not.toBe(a[0]);
+      expect(aCopy[0]).toBe(aCopy[2]);
+    });
+
+    it('should handle date/regex objects with multiple references', function() {
+      var re = /foo/;
+      var d = new Date();
+      var o = {re: re, re2: re, d: d, d2: d};
+
+      var oCopy = copy(o);
+      expect(oCopy.re).toBe(oCopy.re2);
+      expect(oCopy.d).toBe(oCopy.d2);
+
+      oCopy = copy(o, {});
+      expect(oCopy.re).toBe(oCopy.re2);
+      expect(oCopy.d).toBe(oCopy.d2);
     });
 
     it('should clear destination arrays correctly when source is non-array', function() {
       expect(copy(null, [1,2,3])).toEqual([]);
       expect(copy(undefined, [1,2,3])).toEqual([]);
       expect(copy({0: 1, 1: 2}, [1,2,3])).toEqual([1,2]);
+      expect(copy(new Date(), [1,2,3])).toEqual([]);
+      expect(copy(/a/, [1,2,3])).toEqual([]);
+      expect(copy(true, [1,2,3])).toEqual([]);
+    });
+
+    it('should clear destination objects correctly when source is non-array', function() {
+      expect(copy(null, {0:1,1:2,2:3})).toEqual({});
+      expect(copy(undefined, {0:1,1:2,2:3})).toEqual({});
+      expect(copy(new Date(), {0:1,1:2,2:3})).toEqual({});
+      expect(copy(/a/, {0:1,1:2,2:3})).toEqual({});
+      expect(copy(true, {0:1,1:2,2:3})).toEqual({});
+    });
+
+    it('should copy objects with no prototype parent', function() {
+      var obj = extend(Object.create(null), {
+        a: 1,
+        b: 2,
+        c: 3
+      });
+      var dest = copy(obj);
+
+      expect(Object.getPrototypeOf(dest)).toBe(null);
+      expect(dest.a).toBe(1);
+      expect(dest.b).toBe(2);
+      expect(dest.c).toBe(3);
+      expect(Object.keys(dest)).toEqual(['a', 'b', 'c']);
     });
   });
 
@@ -382,6 +458,7 @@ describe('angular', function() {
       expect(hashKey(dst)).not.toEqual(hashKey(src));
     });
 
+
     it('should retain the previous $$hashKey', function() {
       var src,dst,h;
       src = {};
@@ -395,6 +472,7 @@ describe('angular', function() {
       expect(hashKey(dst)).toEqual(h);
     });
 
+
     it('should work when extending with itself', function() {
       var src,dst,h;
       dst = src = {};
@@ -403,8 +481,109 @@ describe('angular', function() {
       // make sure we retain the old key
       expect(hashKey(dst)).toEqual(h);
     });
+
+
+    it('should copy dates by reference', function() {
+      var src = { date: new Date() };
+      var dst = {};
+
+      extend(dst, src);
+
+      expect(dst.date).toBe(src.date);
+    });
   });
 
+
+  describe('merge', function() {
+    it('should recursively copy objects into dst from left to right', function() {
+      var dst = { foo: { bar: 'foobar' }};
+      var src1 = { foo: { bazz: 'foobazz' }};
+      var src2 = { foo: { bozz: 'foobozz' }};
+      merge(dst, src1, src2);
+      expect(dst).toEqual({
+        foo: {
+          bar: 'foobar',
+          bazz: 'foobazz',
+          bozz: 'foobozz'
+        }
+      });
+    });
+
+
+    it('should replace primitives with objects', function() {
+      var dst = { foo: "bloop" };
+      var src = { foo: { bar: { baz: "bloop" }}};
+      merge(dst, src);
+      expect(dst).toEqual({
+        foo: {
+          bar: {
+            baz: "bloop"
+          }
+        }
+      });
+    });
+
+
+    it('should replace null values in destination with objects', function() {
+      var dst = { foo: null };
+      var src = { foo: { bar: { baz: "bloop" }}};
+      merge(dst, src);
+      expect(dst).toEqual({
+        foo: {
+          bar: {
+            baz: "bloop"
+          }
+        }
+      });
+    });
+
+
+    it('should copy references to functions by value rather than merging', function() {
+      function fn() {}
+      var dst = { foo: 1 };
+      var src = { foo: fn };
+      merge(dst, src);
+      expect(dst).toEqual({
+        foo: fn
+      });
+    });
+
+
+    it('should create a new array if destination property is a non-object and source property is an array', function() {
+      var dst = { foo: NaN };
+      var src = { foo: [1,2,3] };
+      merge(dst, src);
+      expect(dst).toEqual({
+        foo: [1,2,3]
+      });
+      expect(dst.foo).not.toBe(src.foo);
+    });
+
+
+    it('should copy dates by value', function() {
+      var src = { date: new Date() };
+      var dst = {};
+
+      merge(dst, src);
+
+      expect(dst.date).not.toBe(src.date);
+      expect(isDate(dst.date)).toBeTruthy();
+      expect(dst.date.valueOf()).toEqual(src.date.valueOf());
+    });
+
+    it('should copy regexp by value', function() {
+      var src = { regexp: /blah/ };
+      var dst = {};
+
+      merge(dst, src);
+
+      expect(dst.regexp).not.toBe(src.regexp);
+      expect(isRegExp(dst.regexp)).toBe(true);
+      expect(dst.regexp.toString()).toBe(src.regexp.toString());
+    });
+  });
+
+
   describe('shallow copy', function() {
     it('should make a copy', function() {
       var original = {key:{}};
@@ -547,6 +726,7 @@ describe('angular', function() {
       expect(equals(new Date(undefined), new Date(0))).toBe(false);
       expect(equals(new Date(undefined), new Date(null))).toBe(false);
       expect(equals(new Date(undefined), new Date('wrong'))).toBe(true);
+      expect(equals(new Date(), /abc/)).toBe(false);
     });
 
     it('should correctly test for keys that are present on Object.prototype', function() {
@@ -564,53 +744,129 @@ describe('angular', function() {
       expect(equals(/abc/, /def/)).toBe(false);
       expect(equals(/^abc/, /abc/)).toBe(false);
       expect(equals(/^abc/, '/^abc/')).toBe(false);
+      expect(equals(/abc/, new Date())).toBe(false);
     });
 
     it('should return false when comparing an object and an array', function() {
       expect(equals({}, [])).toBe(false);
       expect(equals([], {})).toBe(false);
     });
+
+    it('should return false when comparing an object and a RegExp', function() {
+      expect(equals({}, /abc/)).toBe(false);
+      expect(equals({}, new RegExp('abc', 'i'))).toBe(false);
+    });
+
+    it('should return false when comparing an object and a Date', function() {
+      expect(equals({}, new Date())).toBe(false);
+    });
+
+    it('should safely compare objects with no prototype parent', function() {
+      var o1 = extend(Object.create(null), {
+        a: 1, b: 2, c: 3
+      });
+      var o2 = extend(Object.create(null), {
+        a: 1, b: 2, c: 3
+      });
+      expect(equals(o1, o2)).toBe(true);
+      o2.c = 2;
+      expect(equals(o1, o2)).toBe(false);
+    });
+
+
+    it('should safely compare objects which shadow Object.prototype.hasOwnProperty', function() {
+      /* jshint -W001 */
+      var o1 = {
+        hasOwnProperty: true,
+        a: 1,
+        b: 2,
+        c: 3
+      };
+      var o2 = {
+        hasOwnProperty: true,
+        a: 1,
+        b: 2,
+        c: 3
+      };
+      expect(equals(o1, o2)).toBe(true);
+      o1.hasOwnProperty = function() {};
+      expect(equals(o1, o2)).toBe(false);
+    });
   });
 
 
   describe('csp', function() {
+
+    function mockCspElement(cspAttrName, cspAttrValue) {
+      return spyOn(document, 'querySelector').andCallFake(function(selector) {
+        if (selector == '[' + cspAttrName + ']') {
+          var html = '<div ' + cspAttrName + (cspAttrValue ? ('="' + cspAttrValue + '" ') : '') + '></div>';
+          return jqLite(html)[0];
+        }
+      });
+
+    }
+
     var originalFunction;
 
     beforeEach(function() {
-      originalFunction = window.Function;
+      spyOn(window, 'Function');
     });
 
     afterEach(function() {
-      window.Function = originalFunction;
-      delete csp.isActive_;
+      delete csp.rules;
     });
 
 
-    it('should return the false when CSP is not enabled (the default)', function() {
-      expect(csp()).toBe(false);
+    it('should return the false for all rules when CSP is not enabled (the default)', function() {
+      expect(csp()).toEqual({ noUnsafeEval: false, noInlineStyle: false });
     });
 
 
-    it('should return true if CSP is autodetected via CSP v1.1 securityPolicy.isActive property', function() {
-      window.Function = function() { throw new Error('CSP test'); };
-      expect(csp()).toBe(true);
+    it('should return true for noUnsafeEval if eval causes a CSP security policy error', function() {
+      window.Function.andCallFake(function() { throw new Error('CSP test'); });
+      expect(csp()).toEqual({ noUnsafeEval: true, noInlineStyle: false });
+      expect(window.Function).toHaveBeenCalledWith('');
     });
 
 
-    it('should return the true when CSP is enabled manually via [ng-csp]', function() {
-      spyOn(document, 'querySelector').andCallFake(function(selector) {
-        if (selector == '[ng-csp]') return {};
-      });
-      expect(csp()).toBe(true);
+    it('should return true for all rules when CSP is enabled manually via empty `ng-csp` attribute', function() {
+      var spy = mockCspElement('ng-csp');
+      expect(csp()).toEqual({ noUnsafeEval: true, noInlineStyle: true });
+      expect(spy).toHaveBeenCalledWith('[ng-csp]');
+      expect(window.Function).not.toHaveBeenCalled();
     });
 
 
-    it('should return the true when CSP is enabled manually via [data-ng-csp]', function() {
-      spyOn(document, 'querySelector').andCallFake(function(selector) {
-        if (selector == '[data-ng-csp]') return {};
-      });
-      expect(csp()).toBe(true);
-      expect(document.querySelector).toHaveBeenCalledWith('[data-ng-csp]');
+    it('should return true when CSP is enabled manually via [data-ng-csp]', function() {
+      var spy = mockCspElement('data-ng-csp');
+      expect(csp()).toEqual({ noUnsafeEval: true, noInlineStyle: true });
+      expect(spy).toHaveBeenCalledWith('[data-ng-csp]');
+      expect(window.Function).not.toHaveBeenCalled();
+    });
+
+
+    it('should return true for noUnsafeEval if it is specified in the `ng-csp` attribute value', function() {
+      var spy = mockCspElement('ng-csp', 'no-unsafe-eval');
+      expect(csp()).toEqual({ noUnsafeEval: true, noInlineStyle: false });
+      expect(spy).toHaveBeenCalledWith('[ng-csp]');
+      expect(window.Function).not.toHaveBeenCalled();
+    });
+
+
+    it('should return true for noInlineStyle if it is specified in the `ng-csp` attribute value', function() {
+      var spy = mockCspElement('ng-csp', 'no-inline-style');
+      expect(csp()).toEqual({ noUnsafeEval: false, noInlineStyle: true });
+      expect(spy).toHaveBeenCalledWith('[ng-csp]');
+      expect(window.Function).not.toHaveBeenCalled();
+    });
+
+
+    it('should return true for all styles if they are all specified in the `ng-csp` attribute value', function() {
+      var spy = mockCspElement('ng-csp', 'no-inline-style;no-unsafe-eval');
+      expect(csp()).toEqual({ noUnsafeEval: true, noInlineStyle: true });
+      expect(spy).toHaveBeenCalledWith('[ng-csp]');
+      expect(window.Function).not.toHaveBeenCalled();
     });
   });
 
@@ -738,6 +994,12 @@ describe('angular', function() {
         'toString': '123'
       });
     });
+
+    it('should ignore badly escaped = characters', function() {
+      expect(parseKeyValue('test=a=b')).toEqual({
+          'test': 'a=b'
+      });
+    });
   });
 
   describe('toKeyValue', function() {
@@ -899,6 +1161,42 @@ describe('angular', function() {
     });
 
 
+    it('should safely iterate through objects with no prototype parent', function() {
+      var obj = extend(Object.create(null), {
+        a: 1, b: 2, c: 3
+      });
+      var log = [];
+      var self = {};
+      forEach(obj, function(val, key, collection) {
+        expect(this).toBe(self);
+        expect(collection).toBe(obj);
+        log.push(key + '=' + val);
+      }, self);
+      expect(log.length).toBe(3);
+      expect(log).toEqual(['a=1', 'b=2', 'c=3']);
+    });
+
+
+    it('should safely iterate through objects which shadow Object.prototype.hasOwnProperty', function() {
+      /* jshint -W001 */
+      var obj = {
+        hasOwnProperty: true,
+        a: 1,
+        b: 2,
+        c: 3
+      };
+      var log = [];
+      var self = {};
+      forEach(obj, function(val, key, collection) {
+        expect(this).toBe(self);
+        expect(collection).toBe(obj);
+        log.push(key + '=' + val);
+      }, self);
+      expect(log.length).toBe(4);
+      expect(log).toEqual(['hasOwnProperty=true', 'a=1', 'b=2', 'c=3']);
+    });
+
+
     describe('ES spec api compliance', function() {
 
       function testForEachSpec(expectedSize, collection) {
diff --git a/test/auto/injectorSpec.js b/test/auto/injectorSpec.js
index cff2ec5b0e7b..391082e28a26 100644
--- a/test/auto/injectorSpec.js
+++ b/test/auto/injectorSpec.js
@@ -35,6 +35,12 @@ describe('injector', function() {
   });
 
 
+  it('should check its modulesToLoad argument', function() {
+    expect(function() { angular.injector('test'); })
+        .toThrowMinErr('ng', 'areq');
+  });
+
+
   it('should resolve dependency graph and instantiate all services just once', function() {
     var log = [];
 
diff --git a/test/e2e/fixtures/ngJq/index.html b/test/e2e/fixtures/ngJq/index.html
new file mode 100644
index 000000000000..00f268c86066
--- /dev/null
+++ b/test/e2e/fixtures/ngJq/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html ng-app="test" ng-jq>
+  <body>
+    {{jqueryVersion}}
+
+    <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
+    <script src="angular.js"></script>
+    <script type="text/javascript" src="script.js"></script>
+  </body>
+</html>
diff --git a/test/e2e/fixtures/ngJq/script.js b/test/e2e/fixtures/ngJq/script.js
new file mode 100644
index 000000000000..f91e1ea9cd3b
--- /dev/null
+++ b/test/e2e/fixtures/ngJq/script.js
@@ -0,0 +1,4 @@
+angular.module('test', [])
+  .run(function($rootScope) {
+    $rootScope.jqueryVersion = window.angular.element().jquery || 'jqLite';
+  });
diff --git a/test/e2e/fixtures/ngJqJquery/index.html b/test/e2e/fixtures/ngJqJquery/index.html
new file mode 100644
index 000000000000..d648e16df870
--- /dev/null
+++ b/test/e2e/fixtures/ngJqJquery/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html ng-app="test" ng-jq="jQuery_2_1_0">
+  <body>
+      {{jqueryVersion}}
+
+      <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
+      <script>
+        var jQuery_2_1_0 = jQuery.noConflict();
+      </script>
+      <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
+      <script src="angular.js"></script>
+      <script type="text/javascript" src="script.js"></script>
+    </body>
+</html>
diff --git a/test/e2e/fixtures/ngJqJquery/script.js b/test/e2e/fixtures/ngJqJquery/script.js
new file mode 100644
index 000000000000..f91e1ea9cd3b
--- /dev/null
+++ b/test/e2e/fixtures/ngJqJquery/script.js
@@ -0,0 +1,4 @@
+angular.module('test', [])
+  .run(function($rootScope) {
+    $rootScope.jqueryVersion = window.angular.element().jquery || 'jqLite';
+  });
diff --git a/test/e2e/tests/ngJqSpec.js b/test/e2e/tests/ngJqSpec.js
new file mode 100644
index 000000000000..fd9ea368fc0d
--- /dev/null
+++ b/test/e2e/tests/ngJqSpec.js
@@ -0,0 +1,12 @@
+describe('Customizing the jqlite / jquery version', function() {
+
+  it('should be able to force jqlite', function() {
+    loadFixture("ngJq").andWaitForAngular();
+    expect(element(by.binding('jqueryVersion')).getText()).toBe('jqLite');
+  });
+
+  it('should be able to use a specific version jQuery', function() {
+    loadFixture("ngJqJquery").andWaitForAngular();
+    expect(element(by.binding('jqueryVersion')).getText()).toBe('2.1.0');
+  });
+});
diff --git a/test/e2e/tools/util.js b/test/e2e/tools/util.js
index 313e9bda66db..0a615a7d7f84 100644
--- a/test/e2e/tools/util.js
+++ b/test/e2e/tools/util.js
@@ -24,6 +24,10 @@ function testExists(testname) {
 }
 
 function rewriteTestFile(testname, testfile) {
+  if (testfile.search(/^https?:\/\//) === 0) {
+    return testfile;
+  }
+
   var i = 0;
   while (testfile[i] === '/') ++i;
   testfile = testfile.slice(i);
diff --git a/test/helpers/matchers.js b/test/helpers/matchers.js
index 91407c2f795e..9599b2dcbfed 100644
--- a/test/helpers/matchers.js
+++ b/test/helpers/matchers.js
@@ -165,7 +165,7 @@ beforeEach(function() {
 
     toHaveClass: function(clazz) {
       this.message = function() {
-        return "Expected '" + angular.mock.dump(this.actual) + "' to have class '" + clazz + "'.";
+        return "Expected '" + angular.mock.dump(this.actual) + "'" + (this.isNot ? " not " : "") + " to have class '" + clazz + "'.";
       };
       var classes = clazz.trim().split(/\s+/);
       for (var i = 0; i < classes.length; ++i) {
diff --git a/test/helpers/privateMocks.js b/test/helpers/privateMocks.js
index ad5b13f12989..f733afb8393f 100644
--- a/test/helpers/privateMocks.js
+++ b/test/helpers/privateMocks.js
@@ -1,5 +1,45 @@
 'use strict';
 
+/* globals xit */
+function assertCompareNodes(a,b,not) {
+  a = a[0] ? a[0] : a;
+  b = b[0] ? b[0] : b;
+  expect(a === b).toBe(!not);
+}
+
+function baseThey(msg, vals, spec, itFn) {
+  var valsIsArray = angular.isArray(vals);
+
+  angular.forEach(vals, function(val, key) {
+    var m = msg.replace(/\$prop/g, angular.toJson(valsIsArray ? val : key));
+    itFn(m, function() {
+      /* jshint -W040 : ignore possible strict violation due to use of this */
+      spec.call(this, val);
+    });
+  });
+}
+
+function they(msg, vals, spec) {
+  baseThey(msg, vals, spec, it);
+}
+
+function tthey(msg, vals, spec) {
+  baseThey(msg, vals, spec, iit);
+}
+
+function xthey(msg, vals, spec) {
+  baseThey(msg, vals, spec, xit);
+}
+
+function browserSupportsCssAnimations() {
+  var nav = window.navigator.appVersion;
+  if (nav.indexOf('MSIE') >= 0) {
+    var version = parseInt(navigator.appVersion.match(/MSIE ([\d.]+)/)[1]);
+    return version >= 10; //only IE10+ support keyframes / transitions
+  }
+  return true;
+}
+
 function createMockStyleSheet(doc, wind) {
   doc = doc ? doc[0] : document;
   wind = wind || window;
diff --git a/test/helpers/privateMocksSpec.js b/test/helpers/privateMocksSpec.js
index dd4b19f636d4..019dabb576c1 100644
--- a/test/helpers/privateMocksSpec.js
+++ b/test/helpers/privateMocksSpec.js
@@ -1,6 +1,202 @@
 'use strict';
 
 describe('private mocks', function() {
+
+  describe('Jasmine extensions', function() {
+
+    describe('they', function() {
+      it('should call `it` for each item in an array', function() {
+        spyOn(window, 'it');
+
+        they('should do stuff with $prop', ['a', 'b', 'c']);
+        expect(window.it.calls.length).toEqual(3);
+        expect(window.it).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(window.it).toHaveBeenCalledWith('should do stuff with "b"', jasmine.any(Function));
+        expect(window.it).toHaveBeenCalledWith('should do stuff with "c"', jasmine.any(Function));
+      });
+
+      it('should replace multiple occurrences of `$prop`', function() {
+        spyOn(window, 'it');
+
+        they('should fight $prop with $prop', ['fire']);
+        expect(window.it).toHaveBeenCalledWith('should fight "fire" with "fire"', jasmine.any(Function));
+      });
+
+      it('should pass each item in an array to the handler', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        spyOn(window, 'it').andCallFake(function(msg, handler) {
+          handler();
+        });
+        they('should do stuff with $prop', ['a', 'b', 'c'], handlerSpy);
+        expect(handlerSpy).toHaveBeenCalledWith('a');
+        expect(handlerSpy).toHaveBeenCalledWith('b');
+        expect(handlerSpy).toHaveBeenCalledWith('c');
+      });
+
+
+      it('should call `it` for each key-value pair an object', function() {
+        spyOn(window, 'it');
+
+        they('should do stuff with $prop', {a: 1, b:2, c:3});
+        expect(window.it.calls.length).toEqual(3);
+        expect(window.it).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(window.it).toHaveBeenCalledWith('should do stuff with "b"', jasmine.any(Function));
+        expect(window.it).toHaveBeenCalledWith('should do stuff with "c"', jasmine.any(Function));
+      });
+
+
+      it('should pass each key-value pair in an object to the handler', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        spyOn(window, 'it').andCallFake(function(msg, handler) {
+          handler();
+        });
+        they('should do stuff with $prop', {a: 1, b:2, c:3}, handlerSpy);
+        expect(handlerSpy).toHaveBeenCalledWith(1);
+        expect(handlerSpy).toHaveBeenCalledWith(2);
+        expect(handlerSpy).toHaveBeenCalledWith(3);
+      });
+
+
+      it('should call handler with correct `this`', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        var dummyThis = { name: 'dummyThis' };
+
+        spyOn(window, 'it').andCallFake(function(msg, handler) {
+          handler.call(dummyThis);
+        });
+
+        they('should do stuff with $prop', ['a'], handlerSpy);
+        expect(window.it).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(handlerSpy.mostRecentCall.object).toBe(dummyThis);
+      });
+    });
+
+
+    describe('tthey', function() {
+      it('should call `iit` for each item in an array', function() {
+        spyOn(window, 'iit');
+
+        tthey('should do stuff with $prop', ['a', 'b', 'c']);
+        expect(window.iit.calls.length).toEqual(3);
+        expect(window.iit).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(window.iit).toHaveBeenCalledWith('should do stuff with "b"', jasmine.any(Function));
+        expect(window.iit).toHaveBeenCalledWith('should do stuff with "c"', jasmine.any(Function));
+      });
+
+
+      it('should pass each item in an array to the handler', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        spyOn(window, 'iit').andCallFake(function(msg, handler) {
+          handler();
+        });
+        tthey('should do stuff with $prop', ['a', 'b', 'c'], handlerSpy);
+        expect(handlerSpy).toHaveBeenCalledWith('a');
+        expect(handlerSpy).toHaveBeenCalledWith('b');
+        expect(handlerSpy).toHaveBeenCalledWith('c');
+      });
+
+
+      it('should call `it` for each key-value pair an object', function() {
+        spyOn(window, 'iit');
+
+        tthey('should do stuff with $prop', {a: 1, b:2, c:3});
+        expect(window.iit.calls.length).toEqual(3);
+        expect(window.iit).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(window.iit).toHaveBeenCalledWith('should do stuff with "b"', jasmine.any(Function));
+        expect(window.iit).toHaveBeenCalledWith('should do stuff with "c"', jasmine.any(Function));
+      });
+
+
+      it('should pass each key-value pair in an object to the handler', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        spyOn(window, 'iit').andCallFake(function(msg, handler) {
+          handler();
+        });
+        tthey('should do stuff with $prop', {a: 1, b:2, c:3}, handlerSpy);
+        expect(handlerSpy).toHaveBeenCalledWith(1);
+        expect(handlerSpy).toHaveBeenCalledWith(2);
+        expect(handlerSpy).toHaveBeenCalledWith(3);
+      });
+
+
+      it('should call handler with correct `this`', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        var dummyThis = { name: 'dummyThis' };
+
+        spyOn(window, 'iit').andCallFake(function(msg, handler) {
+          handler.call(dummyThis);
+        });
+
+        tthey('should do stuff with $prop', ['a'], handlerSpy);
+        expect(window.iit).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(handlerSpy.mostRecentCall.object).toBe(dummyThis);
+      });
+    });
+
+
+    describe('xthey', function() {
+      it('should call `xit` for each item in an array', function() {
+        spyOn(window, 'xit');
+
+        xthey('should do stuff with $prop', ['a', 'b', 'c']);
+        expect(window.xit.calls.length).toEqual(3);
+        expect(window.xit).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(window.xit).toHaveBeenCalledWith('should do stuff with "b"', jasmine.any(Function));
+        expect(window.xit).toHaveBeenCalledWith('should do stuff with "c"', jasmine.any(Function));
+      });
+
+
+      it('should pass each item in an array to the handler', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        spyOn(window, 'xit').andCallFake(function(msg, handler) {
+          handler();
+        });
+        xthey('should do stuff with $prop', ['a', 'b', 'c'], handlerSpy);
+        expect(handlerSpy).toHaveBeenCalledWith('a');
+        expect(handlerSpy).toHaveBeenCalledWith('b');
+        expect(handlerSpy).toHaveBeenCalledWith('c');
+      });
+
+
+      it('should call `it` for each key-value pair an object', function() {
+        spyOn(window, 'xit');
+
+        xthey('should do stuff with $prop', {a: 1, b:2, c:3});
+        expect(window.xit.calls.length).toEqual(3);
+        expect(window.xit).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(window.xit).toHaveBeenCalledWith('should do stuff with "b"', jasmine.any(Function));
+        expect(window.xit).toHaveBeenCalledWith('should do stuff with "c"', jasmine.any(Function));
+      });
+
+
+      it('should pass each key-value pair in an object to the handler', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        spyOn(window, 'xit').andCallFake(function(msg, handler) {
+          handler();
+        });
+        xthey('should do stuff with $prop', {a: 1, b:2, c:3}, handlerSpy);
+        expect(handlerSpy).toHaveBeenCalledWith(1);
+        expect(handlerSpy).toHaveBeenCalledWith(2);
+        expect(handlerSpy).toHaveBeenCalledWith(3);
+      });
+
+
+      it('should call handler with correct `this`', function() {
+        var handlerSpy = jasmine.createSpy('handler');
+        var dummyThis = { name: 'dummyThis' };
+
+        spyOn(window, 'xit').andCallFake(function(msg, handler) {
+          handler.call(dummyThis);
+        });
+
+        xthey('should do stuff with $prop', ['a'], handlerSpy);
+        expect(window.xit).toHaveBeenCalledWith('should do stuff with "a"', jasmine.any(Function));
+        expect(handlerSpy.mostRecentCall.object).toBe(dummyThis);
+      });
+    });
+  });
+
+
   describe('createMockStyleSheet', function() {
 
     it('should allow custom styles to be created and removed when the stylesheet is destroyed',
diff --git a/test/helpers/testabilityPatch.js b/test/helpers/testabilityPatch.js
index ef03ad6bff8a..74fd2f76add6 100644
--- a/test/helpers/testabilityPatch.js
+++ b/test/helpers/testabilityPatch.js
@@ -37,6 +37,17 @@ beforeEach(function() {
 afterEach(function() {
   var count, cache;
 
+  // both of these nodes are persisted across tests
+  // and therefore the hashCode may be cached
+  var node = document.querySelector('html');
+  if (node) {
+    node.$$hashKey = null;
+  }
+  var bod = document.body;
+  if (bod) {
+    bod.$$hashKey = null;
+  }
+
   if (this.$injector) {
     var $rootScope = this.$injector.get('$rootScope');
     var $rootElement = this.$injector.get('$rootElement');
diff --git a/test/jqLiteSpec.js b/test/jqLiteSpec.js
index 29848825a41a..83d531bc18bc 100644
--- a/test/jqLiteSpec.js
+++ b/test/jqLiteSpec.js
@@ -405,10 +405,13 @@ describe('jqLite', function() {
     it('should provide the non-wrapped data calls', function() {
       var node = document.createElement('div');
 
+      expect(jqLite.hasData(node)).toBe(false);
       expect(jqLite.data(node, "foo")).toBeUndefined();
+      expect(jqLite.hasData(node)).toBe(false);
 
       jqLite.data(node, "foo", "bar");
 
+      expect(jqLite.hasData(node)).toBe(true);
       expect(jqLite.data(node, "foo")).toBe("bar");
       expect(jqLite(node).data("foo")).toBe("bar");
 
@@ -421,6 +424,9 @@ describe('jqLite', function() {
       jqLite.removeData(node);
       jqLite.removeData(node);
       expect(jqLite.data(node, "bar")).toBeUndefined();
+
+      jqLite(node).remove();
+      expect(jqLite.hasData(node)).toBe(false);
     });
 
     it('should emit $destroy event if element removed via remove()', function() {
@@ -612,6 +618,30 @@ describe('jqLite', function() {
       expect(elm.attr('readOnly')).toBeUndefined();
       expect(elm.attr('disabled')).toBeUndefined();
     });
+
+    it('should do nothing when setting or getting on attribute nodes', function() {
+      var attrNode = jqLite(document.createAttribute('myattr'));
+      expect(attrNode).toBeDefined();
+      expect(attrNode[0].nodeType).toEqual(2);
+      expect(attrNode.attr('some-attribute','somevalue')).toEqual(attrNode);
+      expect(attrNode.attr('some-attribute')).toBeUndefined();
+    });
+
+    it('should do nothing when setting or getting on text nodes', function() {
+      var textNode = jqLite(document.createTextNode('some text'));
+      expect(textNode).toBeDefined();
+      expect(textNode[0].nodeType).toEqual(3);
+      expect(textNode.attr('some-attribute','somevalue')).toEqual(textNode);
+      expect(textNode.attr('some-attribute')).toBeUndefined();
+    });
+
+    it('should do nothing when setting or getting on comment nodes', function() {
+      var comment = jqLite(document.createComment('some comment'));
+      expect(comment).toBeDefined();
+      expect(comment[0].nodeType).toEqual(8);
+      expect(comment.attr('some-attribute','somevalue')).toEqual(comment);
+      expect(comment.attr('some-attribute')).toBeUndefined();
+    });
   });
 
 
diff --git a/test/loaderSpec.js b/test/loaderSpec.js
index 6faa4db91940..1c4d0bb45d84 100644
--- a/test/loaderSpec.js
+++ b/test/loaderSpec.js
@@ -32,6 +32,7 @@ describe('module loader', function() {
     var myModule = window.angular.module('my', ['other'], 'config');
 
     expect(myModule.
+      decorator('dk', 'dv').
       provider('sk', 'sv').
       factory('fk', 'fv').
       service('a', 'aa').
@@ -46,6 +47,7 @@ describe('module loader', function() {
     expect(myModule.requires).toEqual(['other']);
     expect(myModule._invokeQueue).toEqual([
       ['$provide', 'constant', ['abc', 123]],
+      ['$provide', 'decorator', ['dk', 'dv']],
       ['$provide', 'provider', ['sk', 'sv']],
       ['$provide', 'factory', ['fk', 'fv']],
       ['$provide', 'service', ['a', 'aa']],
diff --git a/test/ng/anchorScrollSpec.js b/test/ng/anchorScrollSpec.js
index 63213458e55e..24490b4e0d03 100644
--- a/test/ng/anchorScrollSpec.js
+++ b/test/ng/anchorScrollSpec.js
@@ -23,7 +23,6 @@ describe('$anchorScroll', function() {
     };
   }
 
-
   function addElements() {
     var elements = sliceArgs(arguments);
 
@@ -49,9 +48,9 @@ describe('$anchorScroll', function() {
     };
   }
 
-  function callAnchorScroll() {
+  function callAnchorScroll(hash) {
     return function($anchorScroll) {
-      $anchorScroll();
+      $anchorScroll(hash);
     };
   }
 
@@ -141,50 +140,120 @@ describe('$anchorScroll', function() {
     beforeEach(createMockWindow());
 
 
-    it('should scroll to top of the window if empty hash', inject(
-      changeHashAndScroll(''),
-      expectScrollingToTop));
+    describe('and implicitly using `$location.hash()`', function() {
+
+      it('should scroll to top of the window if empty hash', inject(
+        changeHashAndScroll(''),
+        expectScrollingToTop));
+
+
+      it('should not scroll if hash does not match any element', inject(
+        addElements('id=one', 'id=two'),
+        changeHashAndScroll('non-existing'),
+        expectNoScrolling()));
+
+
+      it('should scroll to anchor element with name', inject(
+        addElements('a name=abc'),
+        changeHashAndScroll('abc'),
+        expectScrollingTo('a name=abc')));
+
+
+      it('should not scroll to other than anchor element with name', inject(
+        addElements('input name=xxl', 'select name=xxl', 'form name=xxl'),
+        changeHashAndScroll('xxl'),
+        expectNoScrolling()));
+
+
+      it('should scroll to anchor even if other element with given name exist', inject(
+        addElements('input name=some', 'a name=some'),
+        changeHashAndScroll('some'),
+        expectScrollingTo('a name=some')));
+
+
+      it('should scroll to element with id with precedence over name', inject(
+        addElements('name=abc', 'id=abc'),
+        changeHashAndScroll('abc'),
+        expectScrollingTo('id=abc')));
 
 
-    it('should not scroll if hash does not match any element', inject(
-      addElements('id=one', 'id=two'),
-      changeHashAndScroll('non-existing'),
-      expectNoScrolling()));
+      it('should scroll to top if hash == "top" and no matching element', inject(
+        changeHashAndScroll('top'),
+        expectScrollingToTop));
 
 
-    it('should scroll to anchor element with name', inject(
-      addElements('a name=abc'),
-      changeHashAndScroll('abc'),
-      expectScrollingTo('a name=abc')));
+      it('should scroll to element with id "top" if present', inject(
+        addElements('id=top'),
+        changeHashAndScroll('top'),
+        expectScrollingTo('id=top')));
+    });
+
+
+    describe('and specifying a hash', function() {
+
+      it('should ignore the `hash` argument if not a string', inject(
+        spyOnJQLiteDocumentLoaded(),
+        addElements('id=one', 'id=two'),
+        changeHashTo('one'),   // won't scroll since `jqLiteDocumentLoaded()` is spied upon
+        callAnchorScroll({}),
+        expectScrollingTo('id=one'),
+        unspyOnJQLiteDocumentLoaded()));
+
+
+      it('should ignore `$location.hash()` if `hash` is passed as argument', inject(
+        spyOnJQLiteDocumentLoaded(),
+        addElements('id=one', 'id=two'),
+        changeHashTo('one'),   // won't scroll since `jqLiteDocumentLoaded()` is spied upon
+        callAnchorScroll('two'),
+        expectScrollingTo('id=two'),
+        unspyOnJQLiteDocumentLoaded()));
+
 
+      it('should scroll to top of the window if empty hash', inject(
+        callAnchorScroll(''),
+        expectScrollingToTop));
 
-    it('should not scroll to other than anchor element with name', inject(
-      addElements('input name=xxl', 'select name=xxl', 'form name=xxl'),
-      changeHashAndScroll('xxl'),
-      expectNoScrolling()));
 
+      it('should not scroll if hash does not match any element', inject(
+        addElements('id=one', 'id=two'),
+        callAnchorScroll('non-existing'),
+        expectNoScrolling()));
 
-    it('should scroll to anchor even if other element with given name exist', inject(
-      addElements('input name=some', 'a name=some'),
-      changeHashAndScroll('some'),
-      expectScrollingTo('a name=some')));
 
+      it('should scroll to anchor element with name', inject(
+        addElements('a name=abc'),
+        callAnchorScroll('abc'),
+        expectScrollingTo('a name=abc')));
 
-    it('should scroll to element with id with precedence over name', inject(
-      addElements('name=abc', 'id=abc'),
-      changeHashAndScroll('abc'),
-      expectScrollingTo('id=abc')));
 
+      it('should not scroll to other than anchor element with name', inject(
+        addElements('input name=xxl', 'select name=xxl', 'form name=xxl'),
+        callAnchorScroll('xxl'),
+        expectNoScrolling()));
 
-    it('should scroll to top if hash == "top" and no matching element', inject(
-      changeHashAndScroll('top'),
-      expectScrollingToTop));
 
+      it('should scroll to anchor even if other element with given name exist', inject(
+        addElements('input name=some', 'a name=some'),
+        callAnchorScroll('some'),
+        expectScrollingTo('a name=some')));
 
-    it('should scroll to element with id "top" if present', inject(
-      addElements('id=top'),
-      changeHashAndScroll('top'),
-      expectScrollingTo('id=top')));
+
+      it('should scroll to element with id with precedence over name', inject(
+        addElements('name=abc', 'id=abc'),
+        callAnchorScroll('abc'),
+        expectScrollingTo('id=abc')));
+
+
+      it('should scroll to top if hash == "top" and no matching element', inject(
+        callAnchorScroll('top'),
+        expectScrollingToTop));
+
+
+      it('should scroll to element with id "top" if present', inject(
+        addElements('id=top'),
+        callAnchorScroll('top'),
+        expectScrollingTo('id=top')));
+    });
   });
 
 
diff --git a/test/ng/animateSpec.js b/test/ng/animateSpec.js
index 0c848ad1becd..2e9fdcaa9d3c 100644
--- a/test/ng/animateSpec.js
+++ b/test/ng/animateSpec.js
@@ -82,12 +82,14 @@ describe("$animate", function() {
       expect($animate.leave(element)).toBeAPromise();
     }));
 
-    it("should provide noop `enabled` and `cancel` methods", inject(function($animate) {
-      expect($animate.enabled).toBe(angular.noop);
+    it("should provide the `enabled` and `cancel` methods", inject(function($animate) {
       expect($animate.enabled()).toBeUndefined();
+      expect($animate.cancel({})).toBeUndefined();
+    }));
 
-      expect($animate.cancel).toBe(angular.noop);
-      expect($animate.cancel()).toBeUndefined();
+    it("should provide the `on` and `off` methods", inject(function($animate) {
+      expect(isFunction($animate.on)).toBe(true);
+      expect(isFunction($animate.off)).toBe(true);
     }));
 
     it("should add and remove classes on SVG elements", inject(function($animate, $rootScope) {
@@ -113,6 +115,21 @@ describe("$animate", function() {
       inject();
     });
 
+    it("should register the animation and be available for lookup", function() {
+      var provider;
+      module(function($animateProvider) {
+        provider = $animateProvider;
+      });
+      inject(function() {
+        // by using hasOwnProperty we know for sure that the lookup object is an empty object
+        // instead of inhertiting properties from its original prototype.
+        expect(provider.$$registeredAnimations.hasOwnProperty).toBeFalsy();
+
+        provider.register('.filter', noop);
+        expect(provider.$$registeredAnimations['filter']).toBe('.filter-animation');
+      });
+    });
+
     it("should apply and retain inline styles on the element that is animated", inject(function($animate, $rootScope) {
       var element = jqLite('<div></div>');
       var parent = jqLite('<div></div>');
@@ -148,10 +165,11 @@ describe("$animate", function() {
       $rootScope.$digest();
       assertColor('blue');
 
-      $animate.leave(element, 'off', {
-        to: { color: 'blue' }
+      $animate.leave(element, {
+        to: { color: 'yellow' }
       });
-      assertColor('blue'); //nothing should happen the element is gone anyway
+      $rootScope.$digest();
+      assertColor('yellow');
 
       function assertColor(color) {
         expect(element[0].style.color).toBe(color);
@@ -174,6 +192,175 @@ describe("$animate", function() {
       expect(style.color).toBe('green');
       expect(style.borderColor).toBe('purple');
     }));
+
+    it("should avoid cancelling out add/remove when the element already contains the class",
+      inject(function($animate, $rootScope) {
+
+      var element = jqLite('<div class="ng-hide"></div>');
+
+      $animate.addClass(element, 'ng-hide');
+      $animate.removeClass(element, 'ng-hide');
+      $rootScope.$digest();
+
+      expect(element).not.toHaveClass('ng-hide');
+    }));
+
+    it("should avoid cancelling out remove/add if the element does not contain the class",
+      inject(function($animate, $rootScope) {
+
+      var element = jqLite('<div></div>');
+
+      $animate.removeClass(element, 'ng-hide');
+      $animate.addClass(element, 'ng-hide');
+      $rootScope.$digest();
+
+      expect(element).toHaveClass('ng-hide');
+    }));
+
+    they("should accept an unwrapped \"parent\" element for the $prop event",
+      ['enter', 'move'], function(method) {
+
+      inject(function($document, $animate, $rootElement) {
+        var element = jqLite('<div></div>');
+        var parent = $document[0].createElement('div');
+        $rootElement.append(parent);
+
+        $animate[method](element, parent);
+        expect(element[0].parentNode).toBe(parent);
+      });
+    });
+
+    they("should accept an unwrapped \"after\" element for the $prop event",
+      ['enter', 'move'], function(method) {
+
+      inject(function($document, $animate, $rootElement) {
+        var element = jqLite('<div></div>');
+        var after = $document[0].createElement('div');
+        $rootElement.append(after);
+
+        $animate[method](element, null, after);
+        expect(element[0].previousSibling).toBe(after);
+      });
+    });
+
+    they('$prop() should operate using a native DOM element',
+      ['enter', 'move', 'leave', 'addClass', 'removeClass', 'setClass', 'animate'], function(event) {
+
+      var captureSpy = jasmine.createSpy();
+
+      module(function($provide) {
+        $provide.value('$$animateQueue', {
+          push: captureSpy
+        });
+      });
+
+      inject(function($animate, $rootScope, $document, $rootElement) {
+        var element = jqLite('<div></div>');
+        var parent2 = jqLite('<div></div>');
+        var parent = $rootElement;
+        parent.append(parent2);
+
+        if (event !== 'enter' && event !== 'move') {
+          parent.append(element);
+        }
+
+        var fn, invalidOptions = function() { };
+
+        switch (event) {
+          case 'enter':
+          case 'move':
+            fn = function() {
+              $animate[event](element, parent, parent2, invalidOptions);
+            };
+            break;
+
+          case 'addClass':
+            fn = function() {
+              $animate.addClass(element, 'klass', invalidOptions);
+            };
+            break;
+
+          case 'removeClass':
+            element.className = 'klass';
+            fn = function() {
+              $animate.removeClass(element, 'klass', invalidOptions);
+            };
+            break;
+
+          case 'setClass':
+            element.className = 'two';
+            fn = function() {
+              $animate.setClass(element, 'one', 'two', invalidOptions);
+            };
+            break;
+
+          case 'leave':
+            fn = function() {
+              $animate.leave(element, invalidOptions);
+            };
+            break;
+
+          case 'animate':
+            var toStyles = { color: 'red' };
+            fn = function() {
+              $animate.animate(element, {}, toStyles, 'klass', invalidOptions);
+            };
+            break;
+        }
+
+        expect(function() {
+          fn();
+          $rootScope.$digest();
+        }).not.toThrow();
+
+        var optionsArg = captureSpy.mostRecentCall.args[2];
+        expect(optionsArg).not.toBe(invalidOptions);
+        expect(isObject(optionsArg)).toBeTruthy();
+      });
+    });
+  });
+
+  it('should not issue a call to addClass if the provided class value is not a string or array', function() {
+    inject(function($animate, $rootScope, $rootElement) {
+      var spy = spyOn(window, 'jqLiteAddClass').andCallThrough();
+
+      var element = jqLite('<div></div>');
+      var parent = $rootElement;
+
+      $animate.enter(element, parent, null, { addClass: noop });
+      $rootScope.$digest();
+      expect(spy).not.toHaveBeenCalled();
+
+      $animate.leave(element, { addClass: true });
+      $rootScope.$digest();
+      expect(spy).not.toHaveBeenCalled();
+
+      $animate.enter(element, parent, null, { addClass: 'fatias' });
+      $rootScope.$digest();
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+
+  it('should not issue a call to removeClass if the provided class value is not a string or array', function() {
+    inject(function($animate, $rootScope, $rootElement) {
+      var spy = spyOn(window, 'jqLiteRemoveClass').andCallThrough();
+
+      var element = jqLite('<div></div>');
+      var parent = $rootElement;
+
+      $animate.enter(element, parent, null, {removeClass: noop});
+      $rootScope.$digest();
+      expect(spy).not.toHaveBeenCalled();
+
+      $animate.leave(element, {removeClass: true});
+      $rootScope.$digest();
+      expect(spy).not.toHaveBeenCalled();
+
+      element.addClass('fatias');
+      $animate.enter(element, parent, null, { removeClass: 'fatias' });
+      $rootScope.$digest();
+      expect(spy).toHaveBeenCalled();
+    });
   });
 
   describe('CSS class DOM manipulation', function() {
@@ -189,26 +376,27 @@ describe("$animate", function() {
 
     function setupClassManipulationSpies() {
       inject(function($animate) {
-        addClass = spyOn($animate, '$$addClassImmediately').andCallThrough();
-        removeClass = spyOn($animate, '$$removeClassImmediately').andCallThrough();
+        addClass = spyOn(window, 'jqLiteAddClass').andCallThrough();
+        removeClass = spyOn(window, 'jqLiteRemoveClass').andCallThrough();
       });
     }
 
     function setupClassManipulationLogger(log) {
-      inject(function($animate) {
-        var addClassImmediately = $animate.$$addClassImmediately;
-        var removeClassImmediately = $animate.$$removeClassImmediately;
-        addClass = spyOn($animate, '$$addClassImmediately').andCallFake(function(element, classes) {
+      inject(function() {
+        var _addClass = jqLiteAddClass;
+        addClass = spyOn(window, 'jqLiteAddClass').andCallFake(function(element, classes) {
           var names = classes;
           if (Object.prototype.toString.call(classes) === '[object Array]') names = classes.join(' ');
           log('addClass(' + names + ')');
-          return addClassImmediately.call($animate, element, classes);
+          return _addClass(element, classes);
         });
-        removeClass = spyOn($animate, '$$removeClassImmediately').andCallFake(function(element, classes) {
+
+        var _removeClass = jqLiteRemoveClass;
+        removeClass = spyOn(window, 'jqLiteRemoveClass').andCallFake(function(element, classes) {
           var names = classes;
           if (Object.prototype.toString.call(classes) === '[object Array]') names = classes.join(' ');
           log('removeClass(' + names + ')');
-          return removeClassImmediately.call($animate, element, classes);
+          return _removeClass(element, classes);
         });
       });
     }
@@ -280,7 +468,7 @@ describe("$animate", function() {
     }));
 
 
-    it('should return a promise which is resolved on a different turn', inject(function(log, $animate, $browser, $rootScope) {
+    it('should return a promise which is resolved on a different turn', inject(function(log, $animate, $$rAF, $rootScope) {
       element = jqLite('<p class="test2">test</p>');
 
       $animate.addClass(element, 'test1').then(log.fn('addClass(test1)'));
@@ -288,7 +476,8 @@ describe("$animate", function() {
 
       $rootScope.$digest();
       expect(log).toEqual([]);
-      $browser.defer.flush();
+      $$rAF.flush();
+      $rootScope.$digest();
       expect(log).toEqual(['addClass(test1)', 'removeClass(test2)']);
 
       log.reset();
@@ -297,10 +486,10 @@ describe("$animate", function() {
       $rootScope.$apply(function() {
         $animate.addClass(element, 'test3').then(log.fn('addClass(test3)'));
         $animate.removeClass(element, 'test4').then(log.fn('removeClass(test4)'));
-        expect(log).toEqual([]);
       });
 
-      $browser.defer.flush();
+      $$rAF.flush();
+      $rootScope.$digest();
       expect(log).toEqual(['addClass(test3)', 'removeClass(test4)']);
     }));
 
diff --git a/test/ng/asyncCallbackSpec.js b/test/ng/asyncCallbackSpec.js
deleted file mode 100644
index f9bbe7812062..000000000000
--- a/test/ng/asyncCallbackSpec.js
+++ /dev/null
@@ -1,33 +0,0 @@
-'use strict';
-describe('$$asyncCallback', function() {
-  it('should perform a callback asynchronously', inject(function($$asyncCallback) {
-    var message = 'hello there ';
-    $$asyncCallback(function() {
-      message += 'Angular';
-    });
-
-    expect(message).toBe('hello there ');
-    $$asyncCallback.flush();
-    expect(message).toBe('hello there Angular');
-  }));
-
-  describe('mocks', function() {
-    it('should queue up all async callbacks', inject(function($$asyncCallback) {
-      var callback = jasmine.createSpy('callback');
-      $$asyncCallback(callback);
-      $$asyncCallback(callback);
-      $$asyncCallback(callback);
-      expect(callback.callCount).toBe(0);
-
-      $$asyncCallback.flush();
-      expect(callback.callCount).toBe(3);
-
-      $$asyncCallback(callback);
-      $$asyncCallback(callback);
-      expect(callback.callCount).toBe(3);
-
-      $$asyncCallback.flush();
-      expect(callback.callCount).toBe(5);
-    }));
-  });
-});
diff --git a/test/ng/browserSpecs.js b/test/ng/browserSpecs.js
index 65321c24a499..570e8df3cd3b 100755
--- a/test/ng/browserSpecs.js
+++ b/test/ng/browserSpecs.js
@@ -57,7 +57,9 @@ function MockWindow(options) {
       return getHash(locationHref);
     },
     set hash(value) {
-      locationHref = stripHash(locationHref) + '#' + value;
+      // replace the hash with the new one (stripping off a leading hash if there is one)
+      // See hash setter spec: https://url.spec.whatwg.org/#urlutils-and-urlutilsreadonly-members
+      locationHref = stripHash(locationHref) + '#' + value.replace(/^#/,'');
     },
     replace: function(url) {
       locationHref = url;
@@ -189,11 +191,7 @@ describe('browser', function() {
     }
   });
 
-  it('should contain cookie cruncher', function() {
-    expect(browser.cookies).toBeDefined();
-  });
-
-  describe('outstading requests', function() {
+  describe('outstanding requests', function() {
     it('should process callbacks immedietly with no outstanding requests', function() {
       var callback = jasmine.createSpy('callback');
       browser.notifyWhenNoOutstandingRequests(callback);
@@ -253,248 +251,6 @@ describe('browser', function() {
   });
 
 
-  describe('cookies', function() {
-
-    function deleteAllCookies() {
-      var cookies = document.cookie.split(";");
-      var path = location.pathname;
-
-      for (var i = 0; i < cookies.length; i++) {
-        var cookie = cookies[i];
-        var eqPos = cookie.indexOf("=");
-        var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
-        var parts = path.split('/');
-        while (parts.length) {
-          document.cookie = name + "=;path=" + (parts.join('/') || '/') + ";expires=Thu, 01 Jan 1970 00:00:00 GMT";
-          parts.pop();
-        }
-      }
-    }
-
-    beforeEach(function() {
-      deleteAllCookies();
-      expect(document.cookie).toEqual('');
-    });
-
-
-    afterEach(function() {
-      deleteAllCookies();
-      expect(document.cookie).toEqual('');
-    });
-
-
-    describe('remove all via (null)', function() {
-
-      it('should do nothing when no cookies are set', function() {
-        browser.cookies(null);
-        expect(document.cookie).toEqual('');
-        expect(browser.cookies()).toEqual({});
-      });
-
-    });
-
-    describe('remove via cookies(cookieName, undefined)', function() {
-
-      it('should remove a cookie when it is present', function() {
-        document.cookie = 'foo=bar;path=/';
-
-        browser.cookies('foo', undefined);
-
-        expect(document.cookie).toEqual('');
-        expect(browser.cookies()).toEqual({});
-      });
-
-
-      it('should do nothing when an nonexisting cookie is being removed', function() {
-        browser.cookies('doesntexist', undefined);
-        expect(document.cookie).toEqual('');
-        expect(browser.cookies()).toEqual({});
-      });
-    });
-
-
-    describe('put via cookies(cookieName, string)', function() {
-
-      it('should create and store a cookie', function() {
-        browser.cookies('cookieName', 'cookie=Value');
-        expect(document.cookie).toMatch(/cookieName=cookie%3DValue;? ?/);
-        expect(browser.cookies()).toEqual({'cookieName':'cookie=Value'});
-      });
-
-
-      it('should overwrite an existing unsynced cookie', function() {
-        document.cookie = "cookie=new;path=/";
-
-        var oldVal = browser.cookies('cookie', 'newer');
-
-        expect(document.cookie).toEqual('cookie=newer');
-        expect(browser.cookies()).toEqual({'cookie':'newer'});
-        expect(oldVal).not.toBeDefined();
-      });
-
-      it('should encode both name and value', function() {
-        browser.cookies('cookie1=', 'val;ue');
-        browser.cookies('cookie2=bar;baz', 'val=ue');
-
-        var rawCookies = document.cookie.split("; "); //order is not guaranteed, so we need to parse
-        expect(rawCookies.length).toEqual(2);
-        expect(rawCookies).toContain('cookie1%3D=val%3Bue');
-        expect(rawCookies).toContain('cookie2%3Dbar%3Bbaz=val%3Due');
-      });
-
-      it('should log warnings when 4kb per cookie storage limit is reached', function() {
-        var i, longVal = '', cookieStr;
-
-        for (i = 0; i < 4083; i++) {
-          longVal += 'x';
-        }
-
-        cookieStr = document.cookie;
-        browser.cookies('x', longVal); //total size 4093-4096, so it should go through
-        expect(document.cookie).not.toEqual(cookieStr);
-        expect(browser.cookies()['x']).toEqual(longVal);
-        expect(logs.warn).toEqual([]);
-
-        browser.cookies('x', longVal + 'xxxx'); //total size 4097-4099, a warning should be logged
-        expect(logs.warn).toEqual(
-          [["Cookie 'x' possibly not set or overflowed because it was too large (4097 > 4096 " +
-             "bytes)!"]]);
-
-        //force browser to dropped a cookie and make sure that the cache is not out of sync
-        browser.cookies('x', 'shortVal');
-        expect(browser.cookies().x).toEqual('shortVal'); //needed to prime the cache
-        cookieStr = document.cookie;
-        browser.cookies('x', longVal + longVal + longVal); //should be too long for all browsers
-
-        if (document.cookie !== cookieStr) {
-          this.fail(new Error("browser didn't drop long cookie when it was expected. make the " +
-              "cookie in this test longer"));
-        }
-
-        expect(browser.cookies().x).toEqual('shortVal');
-      });
-    });
-
-    describe('put via cookies(cookieName, string), if no <base href> ', function() {
-      beforeEach(function() {
-        fakeDocument.basePath = undefined;
-      });
-
-      it('should default path in cookie to "" (empty string)', function() {
-        browser.cookies('cookie', 'bender');
-        // This only fails in Safari and IE when cookiePath returns undefined
-        // Where it now succeeds since baseHref return '' instead of undefined
-        expect(document.cookie).toEqual('cookie=bender');
-      });
-    });
-
-    describe('get via cookies()[cookieName]', function() {
-
-      it('should return undefined for nonexistent cookie', function() {
-        expect(browser.cookies().nonexistent).not.toBeDefined();
-      });
-
-
-      it('should return a value for an existing cookie', function() {
-        document.cookie = "foo=bar=baz;path=/";
-        expect(browser.cookies().foo).toEqual('bar=baz');
-      });
-
-      it('should return the the first value provided for a cookie', function() {
-        // For a cookie that has different values that differ by path, the
-        // value for the most specific path appears first.  browser.cookies()
-        // should provide that value for the cookie.
-        document.cookie = 'foo="first"; foo="second"';
-        expect(browser.cookies()['foo']).toBe('"first"');
-      });
-
-      it('should decode cookie values that were encoded by puts', function() {
-        document.cookie = "cookie2%3Dbar%3Bbaz=val%3Due;path=/";
-        expect(browser.cookies()['cookie2=bar;baz']).toEqual('val=ue');
-      });
-
-
-      it('should preserve leading & trailing spaces in names and values', function() {
-        browser.cookies(' cookie name ', ' cookie value ');
-        expect(browser.cookies()[' cookie name ']).toEqual(' cookie value ');
-        expect(browser.cookies()['cookie name']).not.toBeDefined();
-      });
-
-      it('should decode special characters in cookie values', function() {
-        document.cookie = 'cookie_name=cookie_value_%E2%82%AC';
-        expect(browser.cookies()['cookie_name']).toEqual('cookie_value_€');
-      });
-
-      it('should not decode cookie values that do not appear to be encoded', function() {
-        // see #9211 - sometimes cookies contain a value that causes decodeURIComponent to throw
-        document.cookie = 'cookie_name=cookie_value_%XX';
-        expect(browser.cookies()['cookie_name']).toEqual('cookie_value_%XX');
-      });
-    });
-
-
-    describe('getAll via cookies()', function() {
-
-      it('should return cookies as hash', function() {
-        document.cookie = "foo1=bar1;path=/";
-        document.cookie = "foo2=bar2;path=/";
-        expect(browser.cookies()).toEqual({'foo1':'bar1', 'foo2':'bar2'});
-      });
-
-
-      it('should return empty hash if no cookies exist', function() {
-        expect(browser.cookies()).toEqual({});
-      });
-    });
-
-
-    it('should pick up external changes made to browser cookies', function() {
-      browser.cookies('oatmealCookie', 'drool');
-      expect(browser.cookies()).toEqual({'oatmealCookie':'drool'});
-
-      document.cookie = 'oatmealCookie=changed;path=/';
-      expect(browser.cookies().oatmealCookie).toEqual('changed');
-    });
-
-
-    it('should initialize cookie cache with existing cookies', function() {
-      document.cookie = "existingCookie=existingValue;path=/";
-      expect(browser.cookies()).toEqual({'existingCookie':'existingValue'});
-    });
-
-  });
-
-  describe('poller', function() {
-
-    it('should call functions in pollFns in regular intervals', function() {
-      var log = '';
-      browser.addPollFn(function() {log+='a';});
-      browser.addPollFn(function() {log+='b';});
-      expect(log).toEqual('');
-      fakeWindow.setTimeout.flush();
-      expect(log).toEqual('ab');
-      fakeWindow.setTimeout.flush();
-      expect(log).toEqual('abab');
-    });
-
-    it('should startPoller', function() {
-      expect(fakeWindow.timeouts.length).toEqual(0);
-
-      browser.addPollFn(function() {});
-      expect(fakeWindow.timeouts.length).toEqual(1);
-
-      //should remain 1 as it is the check fn
-      browser.addPollFn(function() {});
-      expect(fakeWindow.timeouts.length).toEqual(1);
-    });
-
-    it('should return fn that was passed into addPollFn', function() {
-      var fn = function() { return 1; };
-      var returnedFn = browser.addPollFn(fn);
-      expect(returnedFn).toBe(fn);
-    });
-  });
-
   describe('url', function() {
     var pushState, replaceState, locationReplace;
 
@@ -893,6 +649,23 @@ describe('browser', function() {
         };
       }
     });
+
+
+    it("should stop calling callbacks when application has been torn down", function() {
+      sniffer.history = true;
+      browser.onUrlChange(callback);
+      fakeWindow.location.href = 'http://server/new';
+
+      browser.$$applicationDestroyed();
+
+      fakeWindow.fire('popstate');
+      expect(callback).not.toHaveBeenCalled();
+
+      fakeWindow.fire('hashchange');
+      fakeWindow.setTimeout.flush();
+      expect(callback).not.toHaveBeenCalled();
+    });
+
   });
 
 
@@ -938,7 +711,6 @@ describe('browser', function() {
           fakeWindow.location.href = newUrl;
         });
         $provide.value('$browser', browser);
-        browser.pollFns = [];
 
         sniffer.history = options.history;
         $provide.value('$sniffer', sniffer);
@@ -1061,7 +833,6 @@ describe('browser', function() {
 
     beforeEach(module(function($provide, $locationProvider) {
       $provide.value('$browser', browser);
-      browser.pollFns = [];
     }));
 
     it('should not interfere with legacy browser url replace behavior', function() {
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
index 908739c447a0..ef5787b49fa0 100755
--- a/test/ng/compileSpec.js
+++ b/test/ng/compileSpec.js
@@ -147,6 +147,7 @@ describe('$compile', function() {
 
 
   describe('configuration', function() {
+
     it('should register a directive', function() {
       module(function() {
         directive('div', function(log) {
@@ -201,6 +202,30 @@ describe('$compile', function() {
       });
       inject(function($compile) {});
     });
+
+    it('should throw an exception if a directive name starts with a non-lowercase letter', function() {
+      module(function() {
+        expect(function() {
+          directive('BadDirectiveName', function() { });
+        }).toThrowMinErr('$compile','baddir', "Directive name 'BadDirectiveName' is invalid. The first character must be a lowercase letter");
+      });
+      inject(function($compile) {});
+    });
+    it('should throw an exception if a directive name has leading or trailing whitespace', function() {
+      module(function() {
+        function assertLeadingOrTrailingWhitespaceInDirectiveName(name) {
+          expect(function() {
+            directive(name, function() { });
+          }).toThrowMinErr(
+            '$compile','baddir', 'Directive name \'' + name + '\' is invalid. ' +
+            "The name should not contain leading or trailing whitespaces");
+        }
+        assertLeadingOrTrailingWhitespaceInDirectiveName(' leadingWhitespaceDirectiveName');
+        assertLeadingOrTrailingWhitespaceInDirectiveName('trailingWhitespaceDirectiveName ');
+        assertLeadingOrTrailingWhitespaceInDirectiveName(' leadingAndTrailingWhitespaceDirectiveName ');
+      });
+      inject(function($compile) {});
+    });
   });
 
 
@@ -1271,14 +1296,24 @@ describe('$compile', function() {
         ));
 
         it('should not load cross domain templates by default', inject(
-          function($compile, $rootScope, $templateCache, $sce) {
+          function($compile, $rootScope) {
             expect(function() {
-              $templateCache.put('http://example.com/should-not-load.html', 'Should not load even if in cache.');
               $compile('<div class="crossDomainTemplate"></div>')($rootScope);
             }).toThrowMinErr('$sce', 'insecurl', 'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: http://example.com/should-not-load.html');
           }
         ));
 
+        it('should trust what is already in the template cache', inject(
+          function($compile, $httpBackend, $rootScope, $templateCache) {
+            $httpBackend.expect('GET', 'http://example.com/should-not-load.html').respond('<span>example.com/remote-version</span>');
+            $templateCache.put('http://example.com/should-not-load.html', '<span>example.com/cached-version</span>');
+            element = $compile('<div class="crossDomainTemplate"></div>')($rootScope);
+            expect(sortedHtml(element)).toEqual('<div class="crossDomainTemplate"></div>');
+            $rootScope.$digest();
+            expect(sortedHtml(element)).toEqual('<div class="crossDomainTemplate"><span>example.com/cached-version</span></div>');
+          }
+        ));
+
         it('should load cross domain templates when trusted', inject(
           function($compile, $httpBackend, $rootScope, $sce) {
             $httpBackend.expect('GET', 'http://example.com/trusted-template.html').respond('<span>example.com/trusted_template_contents</span>');
@@ -1326,16 +1361,10 @@ describe('$compile', function() {
               $rootScope.$digest();
 
 
-              expect(sortedHtml(element)).toBeOneOf(
-                  '<div><b class="i-hello"></b><span class="i-cau">Cau!</span></div>',
-                  '<div><b class="i-hello"></b><span class="i-cau" i-cau="">Cau!</span></div>' //ie8
-              );
+              expect(sortedHtml(element)).toBe('<div><b class="i-hello"></b><span class="i-cau">Cau!</span></div>');
 
               $httpBackend.flush();
-              expect(sortedHtml(element)).toBeOneOf(
-                  '<div><span class="i-hello">Hello!</span><span class="i-cau">Cau!</span></div>',
-                  '<div><span class="i-hello" i-hello="">Hello!</span><span class="i-cau" i-cau="">Cau!</span></div>' //ie8
-              );
+              expect(sortedHtml(element)).toBe('<div><span class="i-hello">Hello!</span><span class="i-cau">Cau!</span></div>');
             }
         ));
 
@@ -1362,10 +1391,7 @@ describe('$compile', function() {
 
               $rootScope.$digest();
 
-              expect(sortedHtml(element)).toBeOneOf(
-                  '<div><span class="i-hello">Hello, Elvis!</span></div>',
-                  '<div><span class="i-hello" i-hello="">Hello, Elvis!</span></div>' //ie8
-              );
+              expect(sortedHtml(element)).toBe('<div><span class="i-hello">Hello, Elvis!</span></div>');
             }
         ));
 
@@ -1394,10 +1420,7 @@ describe('$compile', function() {
               element = template($rootScope);
               $rootScope.$digest();
 
-              expect(sortedHtml(element)).toBeOneOf(
-                  '<div><span class="i-hello">Hello, Elvis!</span></div>',
-                  '<div><span class="i-hello" i-hello="">Hello, Elvis!</span></div>' //ie8
-              );
+              expect(sortedHtml(element)).toBe('<div><span class="i-hello">Hello, Elvis!</span></div>');
             }
         ));
 
@@ -2218,6 +2241,45 @@ describe('$compile', function() {
               }}
             };
           });
+          directive('prototypeMethodNameAsScopeVarA', function() {
+            return {
+              scope: {
+                'constructor': '=?',
+                'valueOf': '='
+              },
+              restrict: 'AE',
+              template: '<span></span>'
+            };
+          });
+          directive('prototypeMethodNameAsScopeVarB', function() {
+            return {
+              scope: {
+                'constructor': '@?',
+                'valueOf': '@'
+              },
+              restrict: 'AE',
+              template: '<span></span>'
+            };
+          });
+          directive('prototypeMethodNameAsScopeVarC', function() {
+            return {
+              scope: {
+                'constructor': '&?',
+                'valueOf': '&'
+              },
+              restrict: 'AE',
+              template: '<span></span>'
+            };
+          });
+          directive('watchAsScopeVar', function() {
+            return {
+              scope: {
+                'watch': '='
+              },
+              restrict: 'AE',
+              template: '<span></span>'
+            };
+          });
         }));
 
 
@@ -2318,7 +2380,7 @@ describe('$compile', function() {
           })
         );
 
-        it('should not allow more then one isolate scope creation per element', inject(
+        it('should not allow more than one isolate scope creation per element', inject(
           function($rootScope, $compile) {
             expect(function() {
               $compile('<div class="iscope-a; scope-b"></div>');
@@ -2327,6 +2389,18 @@ describe('$compile', function() {
           })
         );
 
+        it('should not allow more than one isolate/new scope creation per element regardless of `templateUrl`',
+          inject(function($httpBackend) {
+            $httpBackend.expect('GET', 'tiscope.html').respond('<div>Hello, world !</div>');
+
+            expect(function() {
+              compile('<div class="tiscope-a; scope-b"></div>');
+              $httpBackend.flush();
+            }).toThrowMinErr('$compile', 'multidir', 'Multiple directives [scopeB, tiscopeA] ' +
+                'asking for new/isolated scope on: <div class="tiscope-a; scope-b ng-scope">');
+          })
+        );
+
         it('should not allow more than one isolate scope creation per element regardless of directive priority', function() {
           module(function($compileProvider) {
             $compileProvider.directive('highPriorityScope', function() {
@@ -2459,6 +2533,135 @@ describe('$compile', function() {
                 expect(element.isolateScope()).not.toBe($rootScope);
               })
             );
+
+            it('should handle "=" bindings with same method names in Object.prototype correctly when not present', inject(
+              function($rootScope, $compile) {
+                var func = function() {
+                  element = $compile(
+                    '<div prototype-method-name-as-scope-var-a></div>'
+                  )($rootScope);
+                };
+
+                expect(func).not.toThrow();
+                var scope = element.isolateScope();
+                expect(element.find('span').scope()).toBe(scope);
+                expect(scope).not.toBe($rootScope);
+
+                // Not shadowed because optional
+                expect(scope.constructor).toBe($rootScope.constructor);
+                expect(scope.hasOwnProperty('constructor')).toBe(false);
+
+                // Shadowed with undefined because not optional
+                expect(scope.valueOf).toBeUndefined();
+                expect(scope.hasOwnProperty('valueOf')).toBe(true);
+              })
+            );
+
+            it('should handle "=" bindings with same method names in Object.prototype correctly when present', inject(
+                function($rootScope, $compile) {
+                  $rootScope.constructor = 'constructor';
+                  $rootScope.valueOf = 'valueOf';
+                  var func = function() {
+                    element = $compile(
+                      '<div prototype-method-name-as-scope-var-a constructor="constructor" value-of="valueOf"></div>'
+                    )($rootScope);
+                  };
+
+                  expect(func).not.toThrow();
+                  var scope = element.isolateScope();
+                  expect(element.find('span').scope()).toBe(scope);
+                  expect(scope).not.toBe($rootScope);
+                  expect(scope.constructor).toBe('constructor');
+                  expect(scope.hasOwnProperty('constructor')).toBe(true);
+                  expect(scope.valueOf).toBe('valueOf');
+                  expect(scope.hasOwnProperty('valueOf')).toBe(true);
+                })
+            );
+
+            it('should handle "@" bindings with same method names in Object.prototype correctly when not present', inject(
+                function($rootScope, $compile) {
+                  var func = function() {
+                    element = $compile('<div prototype-method-name-as-scope-var-b></div>')($rootScope);
+                  };
+
+                  expect(func).not.toThrow();
+                  var scope = element.isolateScope();
+                  expect(element.find('span').scope()).toBe(scope);
+                  expect(scope).not.toBe($rootScope);
+
+                  // Does not shadow value because optional
+                  expect(scope.constructor).toBe($rootScope.constructor);
+                  expect(scope.hasOwnProperty('constructor')).toBe(false);
+
+                  // Shadows value because not optional
+                  expect(scope.valueOf).toBeUndefined();
+                  expect(scope.hasOwnProperty('valueOf')).toBe(true);
+                })
+            );
+
+            it('should handle "@" bindings with same method names in Object.prototype correctly when present', inject(
+                function($rootScope, $compile) {
+                  var func = function() {
+                    element = $compile(
+                      '<div prototype-method-name-as-scope-var-b constructor="constructor" value-of="valueOf"></div>'
+                    )($rootScope);
+                  };
+
+                  expect(func).not.toThrow();
+                  expect(element.find('span').scope()).toBe(element.isolateScope());
+                  expect(element.isolateScope()).not.toBe($rootScope);
+                  expect(element.isolateScope()['constructor']).toBe('constructor');
+                  expect(element.isolateScope()['valueOf']).toBe('valueOf');
+                })
+            );
+
+            it('should handle "&" bindings with same method names in Object.prototype correctly when not present', inject(
+                function($rootScope, $compile) {
+                  var func = function() {
+                    element = $compile('<div prototype-method-name-as-scope-var-c></div>')($rootScope);
+                  };
+
+                  expect(func).not.toThrow();
+                  expect(element.find('span').scope()).toBe(element.isolateScope());
+                  expect(element.isolateScope()).not.toBe($rootScope);
+                  expect(element.isolateScope()['constructor']).toBe($rootScope.constructor);
+                  expect(element.isolateScope()['valueOf']()).toBeUndefined();
+                })
+            );
+
+            it('should handle "&" bindings with same method names in Object.prototype correctly when present', inject(
+                function($rootScope, $compile) {
+                  $rootScope.constructor = function() { return 'constructor'; };
+                  $rootScope.valueOf = function() { return 'valueOf'; };
+                  var func = function() {
+                    element = $compile(
+                      '<div prototype-method-name-as-scope-var-c constructor="constructor()" value-of="valueOf()"></div>'
+                    )($rootScope);
+                  };
+
+                  expect(func).not.toThrow();
+                  expect(element.find('span').scope()).toBe(element.isolateScope());
+                  expect(element.isolateScope()).not.toBe($rootScope);
+                  expect(element.isolateScope()['constructor']()).toBe('constructor');
+                  expect(element.isolateScope()['valueOf']()).toBe('valueOf');
+                })
+            );
+
+            it('should not throw exception when using "watch" as binding in Firefox', inject(
+                function($rootScope, $compile) {
+                  $rootScope.watch = 'watch';
+                  var func = function() {
+                    element = $compile(
+                      '<div watch-as-scope-var watch="watch"></div>'
+                    )($rootScope);
+                  };
+
+                  expect(func).not.toThrow();
+                  expect(element.find('span').scope()).toBe(element.isolateScope());
+                  expect(element.isolateScope()).not.toBe($rootScope);
+                  expect(element.isolateScope()['watch']).toBe('watch');
+                })
+            );
           });
 
 
@@ -2501,6 +2704,70 @@ describe('$compile', function() {
             );
           });
         });
+
+        describe('multidir isolated scope error messages', function() {
+          angular.module('fakeIsoledScopeModule', [])
+            .directive('fakeScope', function(log) {
+              return {
+                scope: true,
+                restrict: 'CA',
+                compile: function() {
+                  return {pre: function(scope, element) {
+                    log(scope.$id);
+                    expect(element.data('$scope')).toBe(scope);
+                  }};
+                }
+              };
+            })
+            .directive('fakeIScope', function(log) {
+              return {
+                scope: {},
+                restrict: 'CA',
+                compile: function() {
+                  return function(scope, element) {
+                    iscope = scope;
+                    log(scope.$id);
+                    expect(element.data('$isolateScopeNoTemplate')).toBe(scope);
+                  };
+                }
+              };
+            });
+
+          beforeEach(module('fakeIsoledScopeModule', function() {
+            directive('anonymModuleScopeDirective', function(log) {
+              return {
+                scope: true,
+                restrict: 'CA',
+                compile: function() {
+                  return {pre: function(scope, element) {
+                    log(scope.$id);
+                    expect(element.data('$scope')).toBe(scope);
+                  }};
+                }
+              };
+            });
+          }));
+
+          it('should add module name to multidir isolated scope message if directive defined through module', inject(
+              function($rootScope, $compile) {
+                expect(function() {
+                  $compile('<div class="fake-scope; fake-i-scope"></div>');
+                }).toThrowMinErr('$compile', 'multidir',
+                  'Multiple directives [fakeIScope (module: fakeIsoledScopeModule), fakeScope (module: fakeIsoledScopeModule)] ' +
+                  'asking for new/isolated scope on: <div class="fake-scope; fake-i-scope">');
+              })
+          );
+
+          it('sholdn\'t add module name to multidir isolated scope message if directive is defined directly with $compileProvider', inject(
+            function($rootScope, $compile) {
+              expect(function() {
+                $compile('<div class="anonym-module-scope-directive; fake-i-scope"></div>');
+              }).toThrowMinErr('$compile', 'multidir',
+                'Multiple directives [anonymModuleScopeDirective, fakeIScope (module: fakeIsoledScopeModule)] ' +
+                'asking for new/isolated scope on: <div class="anonym-module-scope-directive; fake-i-scope">');
+            })
+          );
+        });
       });
     });
   });
@@ -2724,6 +2991,23 @@ describe('$compile', function() {
     );
 
 
+    it('should call observer only when the attribute value changes', function() {
+      module(function() {
+        directive('observingDirective', function() {
+          return {
+            restrict: 'E',
+            scope: { someAttr: '@' }
+          };
+        });
+      });
+      inject(function($rootScope, $compile) {
+        $compile('<observing-directive observer></observing-directive>')($rootScope);
+        $rootScope.$digest();
+        expect(observeSpy).not.toHaveBeenCalledWith(undefined);
+      });
+    });
+
+
     it('should delegate exceptions to $exceptionHandler', function() {
       observeSpy = jasmine.createSpy('$observe attr').andThrow('ERROR');
 
@@ -2764,6 +3048,25 @@ describe('$compile', function() {
     }));
 
 
+    it('should handle consecutive text elements as a single text element', inject(function($rootScope, $compile) {
+      // No point it running the test, if there is no MutationObserver
+      if (!window.MutationObserver) return;
+
+      // Create and register the MutationObserver
+      var observer = new window.MutationObserver(noop);
+      observer.observe(document.body, {childList: true, subtree: true});
+
+      // Run the actual test
+      var base = jqLite('<div>&mdash; {{ "This doesn\'t." }}</div>');
+      element = $compile(base)($rootScope);
+      $rootScope.$digest();
+      expect(element.text()).toBe("— This doesn't.");
+
+      // Unregister the MutationObserver (and hope it doesn't mess up with subsequent tests)
+      observer.disconnect();
+    }));
+
+
     it('should support custom start/end interpolation symbols in template and directive template',
         function() {
       module(function($interpolateProvider, $compileProvider) {
@@ -3307,6 +3610,58 @@ describe('$compile', function() {
     }));
 
 
+    it('should not overwrite @-bound property each digest when not present', function() {
+      module(function($compileProvider) {
+        $compileProvider.directive('testDir', valueFn({
+          scope: {prop: '@'},
+          controller: function($scope) {
+            $scope.prop = $scope.prop || 'default';
+            this.getProp = function() {
+              return $scope.prop;
+            };
+          },
+          controllerAs: 'ctrl',
+          template: '<p></p>'
+        }));
+      });
+      inject(function($compile, $rootScope) {
+        element = $compile('<div test-dir></div>')($rootScope);
+        var scope = element.isolateScope();
+        expect(scope.ctrl.getProp()).toBe('default');
+
+        $rootScope.$digest();
+        expect(scope.ctrl.getProp()).toBe('default');
+      });
+    });
+
+
+    it('should ignore optional "="-bound property if value is the emptry string', function() {
+      module(function($compileProvider) {
+        $compileProvider.directive('testDir', valueFn({
+          scope: {prop: '=?'},
+          controller: function($scope) {
+            $scope.prop = $scope.prop || 'default';
+            this.getProp = function() {
+              return $scope.prop;
+            };
+          },
+          controllerAs: 'ctrl',
+          template: '<p></p>'
+        }));
+      });
+      inject(function($compile, $rootScope) {
+        element = $compile('<div test-dir></div>')($rootScope);
+        var scope = element.isolateScope();
+        expect(scope.ctrl.getProp()).toBe('default');
+        $rootScope.$digest();
+        expect(scope.ctrl.getProp()).toBe('default');
+        scope.prop = 'foop';
+        $rootScope.$digest();
+        expect(scope.ctrl.getProp()).toBe('foop');
+      });
+    });
+
+
     describe('bind-once', function() {
 
       function countWatches(scope) {
@@ -4168,6 +4523,64 @@ describe('$compile', function() {
         childScope.theCtrl.test();
       });
     });
+
+    describe('should not overwrite @-bound property each digest when not present', function() {
+      it('when creating new scope', function() {
+        module(function($compileProvider) {
+          $compileProvider.directive('testDir', valueFn({
+            scope: true,
+            bindToController: {
+              prop: '@'
+            },
+            controller: function() {
+              var self = this;
+              this.prop = this.prop || 'default';
+              this.getProp = function() {
+                return self.prop;
+              };
+            },
+            controllerAs: 'ctrl',
+            template: '<p></p>'
+          }));
+        });
+        inject(function($compile, $rootScope) {
+          element = $compile('<div test-dir></div>')($rootScope);
+          var scope = element.scope();
+          expect(scope.ctrl.getProp()).toBe('default');
+
+          $rootScope.$digest();
+          expect(scope.ctrl.getProp()).toBe('default');
+        });
+      });
+
+      it('when creating isolate scope', function() {
+        module(function($compileProvider) {
+          $compileProvider.directive('testDir', valueFn({
+            scope: {},
+            bindToController: {
+              prop: '@'
+            },
+            controller: function() {
+              var self = this;
+              this.prop = this.prop || 'default';
+              this.getProp = function() {
+                return self.prop;
+              };
+            },
+            controllerAs: 'ctrl',
+            template: '<p></p>'
+          }));
+        });
+        inject(function($compile, $rootScope) {
+          element = $compile('<div test-dir></div>')($rootScope);
+          var scope = element.isolateScope();
+          expect(scope.ctrl.getProp()).toBe('default');
+
+          $rootScope.$digest();
+          expect(scope.ctrl.getProp()).toBe('default');
+        });
+      });
+    });
   });
 
 
@@ -4209,6 +4622,177 @@ describe('$compile', function() {
     });
 
 
+    it('should respect explicit return value from controller', function() {
+      var expectedController;
+      module(function() {
+        directive('logControllerProp', function(log) {
+          return {
+            controller: function($scope) {
+              this.foo = 'baz'; // value should not be used.
+              return expectedController = {foo: 'bar'};
+            },
+            link: function(scope, element, attrs, controller) {
+              expect(expectedController).toBeDefined();
+              expect(controller).toBe(expectedController);
+              expect(controller.foo).toBe('bar');
+              log('done');
+            }
+          };
+        });
+      });
+      inject(function(log, $compile, $rootScope) {
+        element = $compile('<log-controller-prop></log-controller-prop>')($rootScope);
+        expect(log).toEqual('done');
+        expect(element.data('$logControllerPropController')).toBe(expectedController);
+      });
+    });
+
+
+    it('should get explicit return value of required parent controller', function() {
+      var expectedController;
+      module(function() {
+        directive('nested', function(log) {
+          return {
+            require: '^^?nested',
+            controller: function() {
+              if (!expectedController) expectedController = {foo: 'bar'};
+              return expectedController;
+            },
+            link: function(scope, element, attrs, controller) {
+              if (element.parent().length) {
+                expect(expectedController).toBeDefined();
+                expect(controller).toBe(expectedController);
+                expect(controller.foo).toBe('bar');
+                log('done');
+              }
+            }
+          };
+        });
+      });
+      inject(function(log, $compile, $rootScope) {
+        element = $compile('<div nested><div nested></div></div>')($rootScope);
+        expect(log).toEqual('done');
+        expect(element.data('$nestedController')).toBe(expectedController);
+      });
+    });
+
+
+    it('should respect explicit controller return value when using controllerAs', function() {
+      module(function() {
+        directive('main', function() {
+          return {
+            templateUrl: 'main.html',
+            scope: {},
+            controller: function() {
+              this.name = 'lucas';
+              return {name: 'george'};
+            },
+            controllerAs: 'mainCtrl'
+          };
+        });
+      });
+      inject(function($templateCache, $compile, $rootScope) {
+        $templateCache.put('main.html', '<span>template:{{mainCtrl.name}}</span>');
+        element = $compile('<main/>')($rootScope);
+        $rootScope.$apply();
+        expect(element.text()).toBe('template:george');
+      });
+    });
+
+
+    it('transcluded children should receive explicit return value of parent controller', function() {
+      var expectedController;
+      module(function() {
+        directive('nester', valueFn({
+          transclude: true,
+          controller: function($transclude) {
+            this.foo = 'baz';
+            return expectedController = {transclude:$transclude, foo: 'bar'};
+          },
+          link: function(scope, el, attr, ctrl) {
+            ctrl.transclude(cloneAttach);
+            function cloneAttach(clone) {
+              el.append(clone);
+            }
+          }
+        }));
+        directive('nested', function(log) {
+          return {
+            require: '^^nester',
+            link: function(scope, element, attrs, controller) {
+              expect(controller).toBeDefined();
+              expect(controller).toBe(expectedController);
+              log('done');
+            }
+          };
+        });
+      });
+      inject(function(log, $compile) {
+        element = $compile('<div nester><div nested></div></div>')($rootScope);
+        $rootScope.$apply();
+        expect(log.toString()).toBe('done');
+        expect(element.data('$nesterController')).toBe(expectedController);
+      });
+    });
+
+
+    it('explicit controller return values are ignored if they are primitives', function() {
+      module(function() {
+        directive('logControllerProp', function(log) {
+          return {
+            controller: function($scope) {
+              this.foo = 'baz'; // value *will* be used.
+              return 'bar';
+            },
+            link: function(scope, element, attrs, controller) {
+              log(controller.foo);
+            }
+          };
+        });
+      });
+      inject(function(log, $compile, $rootScope) {
+        element = $compile('<log-controller-prop></log-controller-prop>')($rootScope);
+        expect(log).toEqual('baz');
+        expect(element.data('$logControllerPropController').foo).toEqual('baz');
+      });
+    });
+
+
+    it('should correctly assign controller return values for multiple directives', function() {
+      var directiveController, otherDirectiveController;
+      module(function() {
+
+        directive('myDirective', function(log) {
+          return {
+            scope: true,
+            controller: function($scope) {
+              return directiveController = {
+                foo: 'bar'
+              };
+            }
+          };
+        });
+
+        directive('myOtherDirective', function(log) {
+          return {
+            controller: function($scope) {
+              return otherDirectiveController = {
+                baz: 'luh'
+              };
+            }
+          };
+        });
+
+      });
+
+      inject(function(log, $compile, $rootScope) {
+        element = $compile('<my-directive my-other-directive></my-directive>')($rootScope);
+        expect(element.data('$myDirectiveController')).toBe(directiveController);
+        expect(element.data('$myOtherDirectiveController')).toBe(otherDirectiveController);
+      });
+    });
+
+
     it('should get required parent controller', function() {
       module(function() {
         directive('nested', function(log) {
@@ -5209,8 +5793,13 @@ describe('$compile', function() {
             expect(privateData.events.click).toBeDefined();
             expect(privateData.events.click[0]).toBeDefined();
 
+            //Ensure the angular $destroy event is still sent
+            var destroyCount = 0;
+            element.find("div").on("$destroy", function() { destroyCount++; });
+
             $rootScope.$apply('xs = null');
 
+            expect(destroyCount).toBe(2);
             expect(firstRepeatedElem.data('$scope')).not.toBeDefined();
             privateData = jQuery._data(firstRepeatedElem[0]);
             expect(privateData && privateData.events).not.toBeDefined();
@@ -5231,9 +5820,7 @@ describe('$compile', function() {
 
             testCleanup();
 
-            // The initial ng-repeat div is dumped after parsing hence we expect cleanData
-            // count to be one larger than size of the iterated array.
-            expect(cleanedCount).toBe(xs.length + 1);
+            expect(cleanedCount).toBe(xs.length);
 
             // Restore the previous jQuery.cleanData.
             jQuery.cleanData = currentCleanData;
diff --git a/test/ng/cookieReaderSpec.js b/test/ng/cookieReaderSpec.js
new file mode 100644
index 000000000000..e8756c4b5235
--- /dev/null
+++ b/test/ng/cookieReaderSpec.js
@@ -0,0 +1,103 @@
+'use strict';
+
+describe('$$cookieReader', function() {
+  var $$cookieReader;
+
+  function deleteAllCookies() {
+    var cookies = document.cookie.split(";");
+    var path = location.pathname;
+
+    for (var i = 0; i < cookies.length; i++) {
+      var cookie = cookies[i];
+      var eqPos = cookie.indexOf("=");
+      var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+      var parts = path.split('/');
+      while (parts.length) {
+        document.cookie = name + "=;path=" + (parts.join('/') || '/') + ";expires=Thu, 01 Jan 1970 00:00:00 GMT";
+        parts.pop();
+      }
+    }
+  }
+
+  beforeEach(function() {
+    deleteAllCookies();
+    expect(document.cookie).toEqual('');
+
+    inject(function(_$$cookieReader_) {
+      $$cookieReader = _$$cookieReader_;
+    });
+  });
+
+
+  afterEach(function() {
+    deleteAllCookies();
+    expect(document.cookie).toEqual('');
+  });
+
+
+  describe('get via $$cookieReader()[cookieName]', function() {
+
+    it('should return undefined for nonexistent cookie', function() {
+      expect($$cookieReader().nonexistent).not.toBeDefined();
+    });
+
+
+    it('should return a value for an existing cookie', function() {
+      document.cookie = "foo=bar=baz;path=/";
+      expect($$cookieReader().foo).toEqual('bar=baz');
+    });
+
+    it('should return the the first value provided for a cookie', function() {
+      // For a cookie that has different values that differ by path, the
+      // value for the most specific path appears first.  $$cookieReader()
+      // should provide that value for the cookie.
+      document.cookie = 'foo="first"; foo="second"';
+      expect($$cookieReader()['foo']).toBe('"first"');
+    });
+
+    it('should decode cookie values that were encoded by puts', function() {
+      document.cookie = "cookie2%3Dbar%3Bbaz=val%3Due;path=/";
+      expect($$cookieReader()['cookie2=bar;baz']).toEqual('val=ue');
+    });
+
+
+    it('should preserve leading & trailing spaces in names and values', function() {
+      document.cookie = '%20cookie%20name%20=%20cookie%20value%20';
+      expect($$cookieReader()[' cookie name ']).toEqual(' cookie value ');
+      expect($$cookieReader()['cookie name']).not.toBeDefined();
+    });
+
+    it('should decode special characters in cookie values', function() {
+      document.cookie = 'cookie_name=cookie_value_%E2%82%AC';
+      expect($$cookieReader()['cookie_name']).toEqual('cookie_value_€');
+    });
+
+    it('should not decode cookie values that do not appear to be encoded', function() {
+      // see #9211 - sometimes cookies contain a value that causes decodeURIComponent to throw
+      document.cookie = 'cookie_name=cookie_value_%XX';
+      expect($$cookieReader()['cookie_name']).toEqual('cookie_value_%XX');
+    });
+  });
+
+
+  describe('getAll via $$cookieReader()', function() {
+
+    it('should return cookies as hash', function() {
+      document.cookie = "foo1=bar1;path=/";
+      document.cookie = "foo2=bar2;path=/";
+      expect($$cookieReader()).toEqual({'foo1':'bar1', 'foo2':'bar2'});
+    });
+
+
+    it('should return empty hash if no cookies exist', function() {
+      expect($$cookieReader()).toEqual({});
+    });
+  });
+
+
+  it('should initialize cookie cache with existing cookies', function() {
+    document.cookie = "existingCookie=existingValue;path=/";
+    expect($$cookieReader()).toEqual({'existingCookie':'existingValue'});
+  });
+
+});
diff --git a/test/ng/directive/formSpec.js b/test/ng/directive/formSpec.js
index d69fa707b6ad..27d18f3032e0 100644
--- a/test/ng/directive/formSpec.js
+++ b/test/ng/directive/formSpec.js
@@ -802,6 +802,7 @@ describe('form', function() {
       scope.$digest();
       expect(form).toBePristine();
       scope.$digest();
+
       expect(formCtrl.$pristine).toBe(true);
       expect(formCtrl.$dirty).toBe(false);
       expect(nestedForm).toBePristine();
@@ -881,20 +882,38 @@ describe('form', function() {
 
   it('should rename forms with no parent when interpolated name changes', function() {
     var element = $compile('<form name="name{{nameID}}"></form>')(scope);
-    var element2 = $compile('<div ng-form="name{{nameID}}"></div>')(scope);
+    var element2 = $compile('<div ng-form="ngform{{nameID}}"></div>')(scope);
     scope.nameID = "A";
     scope.$digest();
     var form = element.controller('form');
     var form2 = element2.controller('form');
+    expect(scope.nameA).toBe(form);
+    expect(scope.ngformA).toBe(form2);
     expect(form.$name).toBe('nameA');
-    expect(form2.$name).toBe('nameA');
+    expect(form2.$name).toBe('ngformA');
 
     scope.nameID = "B";
     scope.$digest();
+    expect(scope.nameA).toBeUndefined();
+    expect(scope.ngformA).toBeUndefined();
+    expect(scope.nameB).toBe(form);
+    expect(scope.ngformB).toBe(form2);
     expect(form.$name).toBe('nameB');
-    expect(form2.$name).toBe('nameB');
+    expect(form2.$name).toBe('ngformB');
   });
 
+  it('should rename forms with an initially blank name', function() {
+    var element = $compile('<form name="{{name}}"></form>')(scope);
+    scope.$digest();
+    var form = element.controller('form');
+    expect(scope['']).toBe(form);
+    expect(form.$name).toBe('');
+    scope.name = 'foo';
+    scope.$digest();
+    expect(scope.foo).toBe(form);
+    expect(form.$name).toBe('foo');
+    expect(scope.foo).toBe(form);
+  });
 
   describe('$setSubmitted', function() {
     beforeEach(function() {
diff --git a/test/ng/directive/inputSpec.js b/test/ng/directive/inputSpec.js
index ad98d52abdf9..3c92625a1b43 100644
--- a/test/ng/directive/inputSpec.js
+++ b/test/ng/directive/inputSpec.js
@@ -551,12 +551,8 @@ describe('input', function() {
 
       expect(inputElm.val()).toBe('2013-01');
 
-      try {
-        //set to text for browsers with datetime-local validation.
-        inputElm[0].setAttribute('type', 'text');
-      } catch (e) {
-        //for IE8
-      }
+      //set to text for browsers with datetime-local validation.
+      inputElm[0].setAttribute('type', 'text');
 
       helper.changeInputValueTo('stuff');
       expect(inputElm.val()).toBe('stuff');
@@ -613,6 +609,19 @@ describe('input', function() {
     });
 
 
+    it('should use any timezone if specified in the options', function() {
+      var inputElm = helper.compileInput('<input type="month" ng-model="value" ng-model-options="{timezone: \'+0500\'}" />');
+
+      helper.changeInputValueTo('2013-07');
+      expect(+$rootScope.value).toBe(Date.UTC(2013, 5, 30, 19, 0, 0));
+
+      $rootScope.$apply(function() {
+        $rootScope.value = new Date(Date.UTC(2014, 5, 30, 19, 0, 0));
+      });
+      expect(inputElm.val()).toBe('2014-07');
+    });
+
+
     it('should label parse errors as `month`', function() {
       var inputElm = helper.compileInput('<input type="month" ng-model="val" name="alias" />', {
         valid: false,
@@ -636,6 +645,17 @@ describe('input', function() {
       expect(inputElm.val()).toBe('2013-12');
     });
 
+    it('should only change the month of a bound date in any timezone', function() {
+      var inputElm = helper.compileInput('<input type="month" ng-model="value" ng-model-options="{timezone: \'+0500\'}" />');
+
+      $rootScope.$apply(function() {
+        $rootScope.value = new Date(Date.UTC(2013, 6, 31, 20, 0, 0));
+      });
+      helper.changeInputValueTo('2013-09');
+      expect(+$rootScope.value).toBe(Date.UTC(2013, 7, 31, 20, 0, 0));
+      expect(inputElm.val()).toBe('2013-09');
+    });
+
     describe('min', function() {
       var inputElm;
       beforeEach(function() {
@@ -752,12 +772,8 @@ describe('input', function() {
 
       expect(inputElm.val()).toBe('2013-W02');
 
-      try {
-        //set to text for browsers with datetime-local validation.
-        inputElm[0].setAttribute('type', 'text');
-      } catch (e) {
-        //for IE8
-      }
+      //set to text for browsers with datetime-local validation.
+      inputElm[0].setAttribute('type', 'text');
 
       helper.changeInputValueTo('stuff');
       expect(inputElm.val()).toBe('stuff');
@@ -814,6 +830,19 @@ describe('input', function() {
     });
 
 
+    it('should use any timezone if specified in the options', function() {
+      var inputElm = helper.compileInput('<input type="week" ng-model="value" ng-model-options="{timezone: \'+0500\'}" />');
+
+      helper.changeInputValueTo('2013-W03');
+      expect(+$rootScope.value).toBe(Date.UTC(2013, 0, 16, 19, 0, 0));
+
+      $rootScope.$apply(function() {
+        $rootScope.value = new Date(Date.UTC(2014, 0, 16, 19, 0, 0));
+      });
+      expect(inputElm.val()).toBe('2014-W03');
+    });
+
+
     it('should label parse errors as `week`', function() {
       var inputElm = helper.compileInput('<input type="week" ng-model="val" name="alias" />', {
         valid: false,
@@ -928,12 +957,8 @@ describe('input', function() {
 
       expect(inputElm.val()).toBe('2009-01-06T16:25:00.000');
 
-      try {
-        //set to text for browsers with datetime-local validation.
-        inputElm[0].setAttribute('type', 'text');
-      } catch (e) {
-        //for IE8
-      }
+      //set to text for browsers with datetime-local validation.
+      inputElm[0].setAttribute('type', 'text');
 
       helper.changeInputValueTo('stuff');
       expect(inputElm.val()).toBe('stuff');
@@ -990,6 +1015,30 @@ describe('input', function() {
     });
 
 
+    it('should use any timezone if specified in the options', function() {
+      var inputElm = helper.compileInput('<input type="datetime-local" ng-model="value" ng-model-options="{timezone: \'+0500\'}" />');
+
+      helper.changeInputValueTo('2000-01-01T06:02');
+      expect(+$rootScope.value).toBe(Date.UTC(2000, 0, 1, 1, 2, 0));
+
+      $rootScope.$apply(function() {
+        $rootScope.value = new Date(Date.UTC(2001, 0, 1, 1, 2, 0));
+      });
+      expect(inputElm.val()).toBe('2001-01-01T06:02:00.000');
+    });
+
+
+    it('should fallback to default timezone in case an unknown timezone was passed', function() {
+      var inputElm = helper.compileInput(
+        '<input type="datetime-local" ng-model="value1" ng-model-options="{timezone: \'WTF\'}" />' +
+        '<input type="datetime-local" ng-model="value2" />');
+
+      helper.changeGivenInputTo(inputElm.eq(0), '2000-01-01T06:02');
+      helper.changeGivenInputTo(inputElm.eq(1), '2000-01-01T06:02');
+      expect($rootScope.value1).toEqual($rootScope.value2);
+    });
+
+
     it('should allow to specify the milliseconds', function() {
       var inputElm = helper.compileInput('<input type="datetime-local" ng-model="value"" />');
 
@@ -1216,12 +1265,8 @@ describe('input', function() {
 
       expect(inputElm.val()).toBe('16:25:00.000');
 
-      try {
-        //set to text for browsers with time validation.
-        inputElm[0].setAttribute('type', 'text');
-      } catch (e) {
-        //for IE8
-      }
+      //set to text for browsers with time validation.
+      inputElm[0].setAttribute('type', 'text');
 
       helper.changeInputValueTo('stuff');
       expect(inputElm.val()).toBe('stuff');
@@ -1278,6 +1323,19 @@ describe('input', function() {
     });
 
 
+    it('should use any timezone if specified in the options', function() {
+      var inputElm = helper.compileInput('<input type="time" ng-model="value" ng-model-options="{timezone: \'+0500\'}" />');
+
+      helper.changeInputValueTo('23:02:00');
+      expect(+$rootScope.value).toBe(Date.UTC(1970, 0, 1, 18, 2, 0));
+
+      $rootScope.$apply(function() {
+        $rootScope.value = new Date(Date.UTC(1971, 0, 1, 18, 2, 0));
+      });
+      expect(inputElm.val()).toBe('23:02:00.000');
+    });
+
+
     it('should allow to specify the milliseconds', function() {
       var inputElm = helper.compileInput('<input type="time" ng-model="value"" />');
 
@@ -1497,12 +1555,8 @@ describe('input', function() {
 
       expect(inputElm.val()).toBe('2014-09-14');
 
-      try {
-        //set to text for browsers with date validation.
-        inputElm[0].setAttribute('type', 'text');
-      } catch (e) {
-        //for IE8
-      }
+      //set to text for browsers with date validation.
+      inputElm[0].setAttribute('type', 'text');
 
       helper.changeInputValueTo('1-2-3');
       expect(inputElm.val()).toBe('1-2-3');
@@ -1559,6 +1613,19 @@ describe('input', function() {
     });
 
 
+    it('should use any timezone if specified in the options', function() {
+      var inputElm = helper.compileInput('<input type="date" ng-model="value" ng-model-options="{timezone: \'+0500\'}" />');
+
+      helper.changeInputValueTo('2000-01-01');
+      expect(+$rootScope.value).toBe(Date.UTC(1999, 11, 31, 19, 0, 0));
+
+      $rootScope.$apply(function() {
+        $rootScope.value = new Date(Date.UTC(2000, 11, 31, 19, 0, 0));
+      });
+      expect(inputElm.val()).toBe('2001-01-01');
+    });
+
+
     it('should label parse errors as `date`', function() {
       var inputElm = helper.compileInput('<input type="date" ng-model="val" name="alias" />', {
         valid: false,
@@ -1756,12 +1823,10 @@ describe('input', function() {
       $rootScope.$apply('age = 123');
       expect(inputElm.val()).toBe('123');
 
-      try {
-        // to allow non-number values, we have to change type so that
-        // the browser which have number validation will not interfere with
-        // this test. IE8 won't allow it hence the catch.
-        inputElm[0].setAttribute('type', 'text');
-      } catch (e) {}
+      // to allow non-number values, we have to change type so that
+      // the browser which have number validation will not interfere with
+      // this test.
+      inputElm[0].setAttribute('type', 'text');
 
       helper.changeInputValueTo('123X');
       expect(inputElm.val()).toBe('123X');
@@ -1852,6 +1917,71 @@ describe('input', function() {
     });
 
 
+    it('should parse exponential notation', function() {
+      var inputElm = helper.compileInput('<input type="number" name="alias" ng-model="value" />');
+
+      // #.###e+##
+      $rootScope.form.alias.$setViewValue("1.23214124123412412e+26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(1.23214124123412412e+26);
+
+      // #.###e##
+      $rootScope.form.alias.$setViewValue("1.23214124123412412e26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(1.23214124123412412e26);
+
+      // #.###e-##
+      $rootScope.form.alias.$setViewValue("1.23214124123412412e-26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(1.23214124123412412e-26);
+
+      // ####e+##
+      $rootScope.form.alias.$setViewValue("123214124123412412e+26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(123214124123412412e26);
+
+      // ####e##
+      $rootScope.form.alias.$setViewValue("123214124123412412e26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(123214124123412412e26);
+
+      // ####e-##
+      $rootScope.form.alias.$setViewValue("123214124123412412e-26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(123214124123412412e-26);
+
+      // #.###E+##
+      $rootScope.form.alias.$setViewValue("1.23214124123412412E+26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(1.23214124123412412e+26);
+
+      // #.###E##
+      $rootScope.form.alias.$setViewValue("1.23214124123412412E26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(1.23214124123412412e26);
+
+      // #.###E-##
+      $rootScope.form.alias.$setViewValue("1.23214124123412412E-26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(1.23214124123412412e-26);
+
+      // ####E+##
+      $rootScope.form.alias.$setViewValue("123214124123412412E+26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(123214124123412412e26);
+
+      // ####E##
+      $rootScope.form.alias.$setViewValue("123214124123412412E26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(123214124123412412e26);
+
+      // ####E-##
+      $rootScope.form.alias.$setViewValue("123214124123412412E-26");
+      expect(inputElm).toBeValid();
+      expect($rootScope.value).toBe(123214124123412412e-26);
+    });
+
+
     describe('min', function() {
 
       it('should validate', function() {
diff --git a/test/ng/directive/ngClassSpec.js b/test/ng/directive/ngClassSpec.js
index 2b174dcc2a91..28a49a6bb364 100644
--- a/test/ng/directive/ngClassSpec.js
+++ b/test/ng/directive/ngClassSpec.js
@@ -33,6 +33,32 @@ describe('ngClass', function() {
   }));
 
 
+  it('should add new and remove old classes with same names as Object.prototype properties dynamically', inject(function($rootScope, $compile) {
+    /* jshint -W001 */
+    element = $compile('<div class="existing" ng-class="dynClass"></div>')($rootScope);
+    $rootScope.dynClass = { watch: true, hasOwnProperty: true, isPrototypeOf: true };
+    $rootScope.$digest();
+    expect(element.hasClass('existing')).toBe(true);
+    expect(element.hasClass('watch')).toBe(true);
+    expect(element.hasClass('hasOwnProperty')).toBe(true);
+    expect(element.hasClass('isPrototypeOf')).toBe(true);
+
+    $rootScope.dynClass.watch = false;
+    $rootScope.$digest();
+    expect(element.hasClass('existing')).toBe(true);
+    expect(element.hasClass('watch')).toBe(false);
+    expect(element.hasClass('hasOwnProperty')).toBe(true);
+    expect(element.hasClass('isPrototypeOf')).toBe(true);
+
+    delete $rootScope.dynClass;
+    $rootScope.$digest();
+    expect(element.hasClass('existing')).toBe(true);
+    expect(element.hasClass('watch')).toBe(false);
+    expect(element.hasClass('hasOwnProperty')).toBe(false);
+    expect(element.hasClass('isPrototypeOf')).toBe(false);
+  }));
+
+
   it('should support adding multiple classes via an array', inject(function($rootScope, $compile) {
     element = $compile('<div class="existing" ng-class="[\'A\', \'B\']"></div>')($rootScope);
     $rootScope.$digest();
@@ -63,6 +89,17 @@ describe('ngClass', function() {
     expect(element.hasClass('AnotB')).toBeFalsy();
   }));
 
+  it('should support adding multiple classes via an array mixed with conditionally via a map', inject(function($rootScope, $compile) {
+    element = $compile('<div class="existing" ng-class="[\'A\', {\'B\': condition}]"></div>')($rootScope);
+    $rootScope.$digest();
+    expect(element.hasClass('existing')).toBeTruthy();
+    expect(element.hasClass('A')).toBeTruthy();
+    expect(element.hasClass('B')).toBeFalsy();
+    $rootScope.condition = true;
+    $rootScope.$digest();
+    expect(element.hasClass('B')).toBeTruthy();
+
+  }));
 
   it('should remove classes when the referenced object is the same but its property is changed',
     inject(function($rootScope, $compile) {
@@ -414,14 +451,13 @@ describe('ngClass animations', function() {
     });
   });
 
-  it("should consider the ngClass expression evaluation before performing an animation", function() {
+  it("should combine the ngClass evaluation with the enter animation", function() {
 
     //mocks are not used since the enter delegation method is called before addClass and
     //it makes it impossible to test to see that addClass is called first
     module('ngAnimate');
     module('ngAnimateMock');
 
-    var digestQueue = [];
     module(function($animateProvider) {
       $animateProvider.register('.crazy', function() {
         return {
@@ -431,29 +467,13 @@ describe('ngClass animations', function() {
           }
         };
       });
-
-      return function($rootScope) {
-        var before = $rootScope.$$postDigest;
-        $rootScope.$$postDigest = function() {
-          var args = arguments;
-          digestQueue.push(function() {
-            before.apply($rootScope, args);
-          });
-        };
-      };
     });
-    inject(function($compile, $rootScope, $browser, $rootElement, $animate, $timeout, $document) {
-
-      // Animations need to digest twice in order to be enabled regardless if there are no template HTTP requests.
-      $rootScope.$digest();
-      digestQueue.shift()();
-
-      $rootScope.$digest();
-      digestQueue.shift()();
+    inject(function($compile, $rootScope, $browser, $rootElement, $animate, $timeout, $$body, $$rAF) {
+      $animate.enabled(true);
 
       $rootScope.val = 'crazy';
       element = angular.element('<div ng-class="val"></div>');
-      jqLite($document[0].body).append($rootElement);
+      $$body.append($rootElement);
 
       $compile(element)($rootScope);
 
@@ -467,25 +487,13 @@ describe('ngClass animations', function() {
       expect(element.hasClass('crazy')).toBe(false);
       expect(enterComplete).toBe(false);
 
-      expect(digestQueue.length).toBe(1);
       $rootScope.$digest();
-
-      $timeout.flush();
-
-      expect(element.hasClass('crazy')).toBe(true);
-      expect(enterComplete).toBe(false);
-
-      digestQueue.shift()(); //enter
-      expect(digestQueue.length).toBe(0);
-
-      //we don't normally need this, but since the timing between digests
-      //is spaced-out then it is required so that the original digestion
-      //is kicked into gear
+      $$rAF.flush();
       $rootScope.$digest();
-      $animate.triggerCallbacks();
 
-      expect(element.data('state')).toBe('crazy-enter');
+      expect(element.hasClass('crazy')).toBe(true);
       expect(enterComplete).toBe(true);
+      expect(element.data('state')).toBe('crazy-enter');
     });
   });
 
diff --git a/test/ng/directive/ngIncludeSpec.js b/test/ng/directive/ngIncludeSpec.js
index b1ec3e735e1f..9cecde9825a8 100644
--- a/test/ng/directive/ngIncludeSpec.js
+++ b/test/ng/directive/ngIncludeSpec.js
@@ -354,11 +354,7 @@ describe('ngInclude', function() {
 
     expect(window._ngIncludeCausesScriptToRun).toBe(true);
 
-    // IE8 doesn't like deleting properties of window
-    window._ngIncludeCausesScriptToRun = undefined;
-    try {
-      delete window._ngIncludeCausesScriptToRun;
-    } catch (e) {}
+    delete window._ngIncludeCausesScriptToRun;
   }));
 
 
diff --git a/test/ng/directive/ngModelSpec.js b/test/ng/directive/ngModelSpec.js
index 583414deaa9c..7f4bfc205dfb 100644
--- a/test/ng/directive/ngModelSpec.js
+++ b/test/ng/directive/ngModelSpec.js
@@ -578,6 +578,29 @@ describe('ngModel', function() {
 
         dealoc(form);
       }));
+
+
+      it('should set NaN as the $modelValue when an asyncValidator is present',
+        inject(function($q) {
+
+        ctrl.$asyncValidators.test = function() {
+          return $q(function(resolve, reject) {
+            resolve();
+          });
+        };
+
+        scope.$apply('value = 10');
+        expect(ctrl.$modelValue).toBe(10);
+
+        expect(function() {
+          scope.$apply(function() {
+            scope.value = NaN;
+          });
+        }).not.toThrow();
+
+        expect(ctrl.$modelValue).toBeNaN();
+
+      }));
     });
 
 
@@ -1068,6 +1091,31 @@ describe('ngModel', function() {
       }));
 
 
+      it('should be possible to extend Object prototype and still be able to do form validation',
+        inject(function($compile, $rootScope) {
+        Object.prototype.someThing = function() {};
+        var element = $compile('<form name="myForm">' +
+                                 '<input type="text" name="username" ng-model="username" minlength="10" required />' +
+                               '</form>')($rootScope);
+        var inputElm = element.find('input');
+
+        var formCtrl = $rootScope.myForm;
+        var usernameCtrl = formCtrl.username;
+
+        $rootScope.$digest();
+        expect(usernameCtrl.$invalid).toBe(true);
+        expect(formCtrl.$invalid).toBe(true);
+
+        usernameCtrl.$setViewValue('valid-username');
+        $rootScope.$digest();
+
+        expect(usernameCtrl.$invalid).toBe(false);
+        expect(formCtrl.$invalid).toBe(false);
+        delete Object.prototype.someThing;
+
+        dealoc(element);
+      }));
+
       it('should re-evaluate the form validity state once the asynchronous promise has been delivered',
         inject(function($compile, $rootScope, $q) {
 
@@ -1133,17 +1181,17 @@ describe('ngModel', function() {
 
 
       it('should minimize janky setting of classes during $validate() and ngModelWatch', inject(function($animate, $compile, $rootScope) {
-        var addClass = $animate.$$addClassImmediately;
-        var removeClass = $animate.$$removeClassImmediately;
+        var addClass = $animate.addClass;
+        var removeClass = $animate.removeClass;
         var addClassCallCount = 0;
         var removeClassCallCount = 0;
         var input;
-        $animate.$$addClassImmediately = function(element, className) {
+        $animate.addClass = function(element, className) {
           if (input && element[0] === input[0]) ++addClassCallCount;
           return addClass.call($animate, element, className);
         };
 
-        $animate.$$removeClassImmediately = function(element, className) {
+        $animate.removeClass = function(element, className) {
           if (input && element[0] === input[0]) ++removeClassCallCount;
           return removeClass.call($animate, element, className);
         };
@@ -1221,6 +1269,96 @@ describe('ngModel', function() {
         expect(ctrl.$validators.mock).toHaveBeenCalledWith('a', 'ab');
         expect(ctrl.$validators.mock.calls.length).toEqual(2);
       });
+
+      it('should validate correctly when $parser name equals $validator key', function() {
+
+        ctrl.$validators.parserOrValidator = function(value) {
+          switch (value) {
+            case 'allInvalid':
+            case 'parseValid-validatorsInvalid':
+            case 'stillParseValid-validatorsInvalid':
+              return false;
+            default:
+              return true;
+          }
+        };
+
+        ctrl.$validators.validator = function(value) {
+          switch (value) {
+            case 'allInvalid':
+            case 'parseValid-validatorsInvalid':
+            case 'stillParseValid-validatorsInvalid':
+              return false;
+            default:
+              return true;
+          }
+        };
+
+        ctrl.$$parserName = 'parserOrValidator';
+        ctrl.$parsers.push(function(value) {
+          switch (value) {
+            case 'allInvalid':
+            case 'stillAllInvalid':
+            case 'parseInvalid-validatorsValid':
+            case 'stillParseInvalid-validatorsValid':
+              return undefined;
+            default:
+              return value;
+          }
+        });
+
+        //Parser and validators are invalid
+        scope.$apply('value = "allInvalid"');
+        expect(scope.value).toBe('allInvalid');
+        expect(ctrl.$error).toEqual({parserOrValidator: true, validator: true});
+
+        ctrl.$validate();
+        expect(scope.value).toEqual('allInvalid');
+        expect(ctrl.$error).toEqual({parserOrValidator: true, validator: true});
+
+        ctrl.$setViewValue('stillAllInvalid');
+        expect(scope.value).toBeUndefined();
+        expect(ctrl.$error).toEqual({parserOrValidator: true});
+
+        ctrl.$validate();
+        expect(scope.value).toBeUndefined();
+        expect(ctrl.$error).toEqual({parserOrValidator: true});
+
+        //Parser is valid, validators are invalid
+        scope.$apply('value = "parseValid-validatorsInvalid"');
+        expect(scope.value).toBe('parseValid-validatorsInvalid');
+        expect(ctrl.$error).toEqual({parserOrValidator: true, validator: true});
+
+        ctrl.$validate();
+        expect(scope.value).toBe('parseValid-validatorsInvalid');
+        expect(ctrl.$error).toEqual({parserOrValidator: true, validator: true});
+
+        ctrl.$setViewValue('stillParseValid-validatorsInvalid');
+        expect(scope.value).toBeUndefined();
+        expect(ctrl.$error).toEqual({parserOrValidator: true, validator: true});
+
+        ctrl.$validate();
+        expect(scope.value).toBeUndefined();
+        expect(ctrl.$error).toEqual({parserOrValidator: true, validator: true});
+
+        //Parser is invalid, validators are valid
+        scope.$apply('value = "parseInvalid-validatorsValid"');
+        expect(scope.value).toBe('parseInvalid-validatorsValid');
+        expect(ctrl.$error).toEqual({});
+
+        ctrl.$validate();
+        expect(scope.value).toBe('parseInvalid-validatorsValid');
+        expect(ctrl.$error).toEqual({});
+
+        ctrl.$setViewValue('stillParseInvalid-validatorsValid');
+        expect(scope.value).toBeUndefined();
+        expect(ctrl.$error).toEqual({parserOrValidator: true});
+
+        ctrl.$validate();
+        expect(scope.value).toBeUndefined();
+        expect(ctrl.$error).toEqual({parserOrValidator: true});
+      });
+
     });
   });
 
diff --git a/test/ng/directive/ngOptionsSpec.js b/test/ng/directive/ngOptionsSpec.js
index 21f890fc5406..5498a61d9d12 100644
--- a/test/ng/directive/ngOptionsSpec.js
+++ b/test/ng/directive/ngOptionsSpec.js
@@ -151,11 +151,18 @@ describe('ngOptions', function() {
 
   it('should throw when not formated "? for ? in ?"', function() {
     expect(function() {
-        compile('<select ng-model="selected" ng-options="i dont parse"></select>')(scope);
+        compile('<select ng-model="selected" ng-options="i dont parse"></select>');
       }).toThrowMinErr('ngOptions', 'iexp', /Expected expression in form of/);
   });
 
 
+  it('should have optional dependency on ngModel', function() {
+    expect(function() {
+      compile('<select ng-options="item in items"></select>');
+    }).not.toThrow();
+  });
+
+
   it('should render a list', function() {
     createSingleSelect();
 
@@ -173,6 +180,47 @@ describe('ngOptions', function() {
   });
 
 
+  it('should not include properties with non-numeric keys in array-like collections when using array syntax', function() {
+    createSelect({
+      'ng-model':'selected',
+      'ng-options':'value for value in values'
+    });
+
+    scope.$apply(function() {
+      scope.values = { 0: 'X', 1: 'Y', 2: 'Z', 'a': 'A', length: 3};
+      scope.selected = scope.values[1];
+    });
+
+    var options = element.find('option');
+    expect(options.length).toEqual(3);
+    expect(options.eq(0)).toEqualOption('X');
+    expect(options.eq(1)).toEqualOption('Y');
+    expect(options.eq(2)).toEqualOption('Z');
+
+  });
+
+
+  it('should include properties with non-numeric keys in array-like collections when using object syntax', function() {
+    createSelect({
+      'ng-model':'selected',
+      'ng-options':'value for (key, value) in values'
+    });
+
+    scope.$apply(function() {
+      scope.values = { 0: 'X', 1: 'Y', 2: 'Z', 'a': 'A', length: 3};
+      scope.selected = scope.values[1];
+    });
+
+    var options = element.find('option');
+    expect(options.length).toEqual(5);
+    expect(options.eq(0)).toEqualOption('X');
+    expect(options.eq(1)).toEqualOption('Y');
+    expect(options.eq(2)).toEqualOption('Z');
+    expect(options.eq(3)).toEqualOption('A');
+    expect(options.eq(4)).toEqualOption(3);
+  });
+
+
   it('should render an object', function() {
     createSelect({
       'ng-model': 'selected',
@@ -355,6 +403,7 @@ describe('ngOptions', function() {
     expect(options.eq(2)).toEqualOption(scope.values[2], 'D');
   });
 
+
   it('should preserve pre-existing empty option', function() {
     createSingleSelect(true);
 
@@ -399,6 +448,43 @@ describe('ngOptions', function() {
   });
 
 
+  it('should not watch non-numeric array properties', function() {
+    createSelect({
+      'ng-options': 'value as createLabel(value) for value in array',
+      'ng-model': 'selected'
+    });
+    scope.createLabel = jasmine.createSpy('createLabel').andCallFake(function(value) { return value; });
+    scope.array = ['a', 'b', 'c'];
+    scope.array.$$private = 'do not watch';
+    scope.array.$property = 'do not watch';
+    scope.array.other = 'do not watch';
+    scope.array.fn = function() {};
+    scope.selected = 'b';
+    scope.$digest();
+
+    expect(scope.createLabel).toHaveBeenCalledWith('a');
+    expect(scope.createLabel).toHaveBeenCalledWith('b');
+    expect(scope.createLabel).toHaveBeenCalledWith('c');
+    expect(scope.createLabel).not.toHaveBeenCalledWith('do not watch');
+    expect(scope.createLabel).not.toHaveBeenCalledWith(jasmine.any(Function));
+  });
+
+
+  it('should not watch object properties that start with $ or $$', function() {
+    createSelect({
+      'ng-options': 'key as createLabel(key) for (key, value) in object',
+      'ng-model': 'selected'
+    });
+    scope.createLabel = jasmine.createSpy('createLabel').andCallFake(function(value) { return value; });
+    scope.object = {'regularProperty': 'visible', '$$private': 'invisible', '$property': 'invisible'};
+    scope.selected = 'regularProperty';
+    scope.$digest();
+
+    expect(scope.createLabel).toHaveBeenCalledWith('regularProperty');
+    expect(scope.createLabel).not.toHaveBeenCalledWith('$$private');
+    expect(scope.createLabel).not.toHaveBeenCalledWith('$property');
+  });
+
   it('should allow expressions over multiple lines', function() {
     scope.isNotFoo = function(item) {
       return item.name !== 'Foo';
@@ -472,6 +558,30 @@ describe('ngOptions', function() {
   });
 
 
+  it('should update the label if only the property has changed', function() {
+    // ng-options="value.name for value in values"
+    // ng-model="selected"
+    createSingleSelect();
+
+    scope.$apply(function() {
+      scope.values = [{name: 'A'}, {name: 'B'}, {name: 'C'}];
+      scope.selected = scope.values[0];
+    });
+
+    var options = element.find('option');
+    expect(options.eq(0).prop('label')).toEqual('A');
+    expect(options.eq(1).prop('label')).toEqual('B');
+    expect(options.eq(2).prop('label')).toEqual('C');
+
+
+    scope.$apply('values[0].name = "X"');
+
+    options = element.find('option');
+    expect(options.eq(0).prop('label')).toEqual('X');
+
+  });
+
+
   // bug fix #9714
   it('should select the matching option when the options are updated', function() {
 
@@ -533,6 +643,199 @@ describe('ngOptions', function() {
   });
 
 
+  describe('disableWhen expression', function() {
+
+    describe('on single select', function() {
+
+      it('should disable options', function() {
+
+        scope.selected = '';
+        scope.options = [
+          { name: 'white', value: '#FFFFFF' },
+          { name: 'one', value: 1, unavailable: true },
+          { name: 'notTrue', value: false },
+          { name: 'thirty', value: 30, unavailable: false }
+        ];
+        createSelect({
+          'ng-options': 'o.value as o.name disable when o.unavailable for o in options',
+          'ng-model': 'selected'
+        });
+        var options = element.find('option');
+
+        expect(options.length).toEqual(5);
+        expect(options.eq(1).prop('disabled')).toEqual(false);
+        expect(options.eq(2).prop('disabled')).toEqual(true);
+        expect(options.eq(3).prop('disabled')).toEqual(false);
+        expect(options.eq(4).prop('disabled')).toEqual(false);
+      });
+
+
+      it('should not select disabled options when model changes', function() {
+        scope.options = [
+          { name: 'white', value: '#FFFFFF' },
+          { name: 'one', value: 1, unavailable: true },
+          { name: 'notTrue', value: false },
+          { name: 'thirty', value: 30, unavailable: false }
+        ];
+        createSelect({
+          'ng-options': 'o.value as o.name disable when o.unavailable for o in options',
+          'ng-model': 'selected'
+        });
+
+        // Initially the model is set to an enabled option
+        scope.$apply('selected = 30');
+        var options = element.find('option');
+        expect(options.eq(3).prop('selected')).toEqual(true);
+
+        // Now set the model to a disabled option
+        scope.$apply('selected = 1');
+        options = element.find('option');
+
+        expect(element.val()).toEqualUnknownValue('?');
+        expect(options.length).toEqual(5);
+        expect(options.eq(0).prop('selected')).toEqual(true);
+        expect(options.eq(2).prop('selected')).toEqual(false);
+        expect(options.eq(4).prop('selected')).toEqual(false);
+      });
+
+
+      it('should select options in model when they become enabled', function() {
+        scope.options = [
+          { name: 'white', value: '#FFFFFF' },
+          { name: 'one', value: 1, unavailable: true },
+          { name: 'notTrue', value: false },
+          { name: 'thirty', value: 30, unavailable: false }
+        ];
+        createSelect({
+          'ng-options': 'o.value as o.name disable when o.unavailable for o in options',
+          'ng-model': 'selected'
+        });
+
+        // Set the model to a disabled option
+        scope.$apply('selected = 1');
+        var options = element.find('option');
+
+        expect(element.val()).toEqualUnknownValue('?');
+        expect(options.length).toEqual(5);
+        expect(options.eq(0).prop('selected')).toEqual(true);
+        expect(options.eq(2).prop('selected')).toEqual(false);
+        expect(options.eq(4).prop('selected')).toEqual(false);
+
+        // Now enable that option
+        scope.$apply(function() {
+          scope.options[1].unavailable = false;
+        });
+
+        expect(element).toEqualSelectValue(1);
+        options = element.find('option');
+        expect(options.length).toEqual(4);
+        expect(options.eq(1).prop('selected')).toEqual(true);
+        expect(options.eq(3).prop('selected')).toEqual(false);
+      });
+    });
+
+
+    describe('on multi select', function() {
+
+      it('should disable options', function() {
+
+        scope.selected = [];
+        scope.options = [
+          { name: 'a', value: 0 },
+          { name: 'b', value: 1, unavailable: true },
+          { name: 'c', value: 2 },
+          { name: 'd', value: 3, unavailable: false }
+        ];
+        createSelect({
+          'ng-options': 'o.value as o.name disable when o.unavailable for o in options',
+          'multiple': true,
+          'ng-model': 'selected'
+        });
+        var options = element.find('option');
+
+        expect(options.eq(0).prop('disabled')).toEqual(false);
+        expect(options.eq(1).prop('disabled')).toEqual(true);
+        expect(options.eq(2).prop('disabled')).toEqual(false);
+        expect(options.eq(3).prop('disabled')).toEqual(false);
+      });
+
+
+      it('should not select disabled options when model changes', function() {
+        scope.options = [
+          { name: 'a', value: 0 },
+          { name: 'b', value: 1, unavailable: true },
+          { name: 'c', value: 2 },
+          { name: 'd', value: 3, unavailable: false }
+        ];
+        createSelect({
+          'ng-options': 'o.value as o.name disable when o.unavailable for o in options',
+          'multiple': true,
+          'ng-model': 'selected'
+        });
+
+        // Initially the model is set to an enabled option
+        scope.$apply('selected = [3]');
+        var options = element.find('option');
+        expect(options.eq(0).prop('selected')).toEqual(false);
+        expect(options.eq(1).prop('selected')).toEqual(false);
+        expect(options.eq(2).prop('selected')).toEqual(false);
+        expect(options.eq(3).prop('selected')).toEqual(true);
+
+        // Now add a disabled option
+        scope.$apply('selected = [1,3]');
+        options = element.find('option');
+        expect(options.eq(0).prop('selected')).toEqual(false);
+        expect(options.eq(1).prop('selected')).toEqual(false);
+        expect(options.eq(2).prop('selected')).toEqual(false);
+        expect(options.eq(3).prop('selected')).toEqual(true);
+
+        // Now only select the disabled option
+        scope.$apply('selected = [1]');
+        expect(options.eq(0).prop('selected')).toEqual(false);
+        expect(options.eq(1).prop('selected')).toEqual(false);
+        expect(options.eq(2).prop('selected')).toEqual(false);
+        expect(options.eq(3).prop('selected')).toEqual(false);
+      });
+
+
+      it('should select options in model when they become enabled', function() {
+        scope.options = [
+          { name: 'a', value: 0 },
+          { name: 'b', value: 1, unavailable: true },
+          { name: 'c', value: 2 },
+          { name: 'd', value: 3, unavailable: false }
+        ];
+        createSelect({
+          'ng-options': 'o.value as o.name disable when o.unavailable for o in options',
+          'multiple': true,
+          'ng-model': 'selected'
+        });
+
+        // Set the model to a disabled option
+        scope.$apply('selected = [1]');
+        var options = element.find('option');
+
+        expect(options.eq(0).prop('selected')).toEqual(false);
+        expect(options.eq(1).prop('selected')).toEqual(false);
+        expect(options.eq(2).prop('selected')).toEqual(false);
+        expect(options.eq(3).prop('selected')).toEqual(false);
+
+        // Now enable that option
+        scope.$apply(function() {
+          scope.options[1].unavailable = false;
+        });
+
+        expect(element).toEqualSelectValue([1], true);
+        options = element.find('option');
+        expect(options.eq(0).prop('selected')).toEqual(false);
+        expect(options.eq(1).prop('selected')).toEqual(true);
+        expect(options.eq(2).prop('selected')).toEqual(false);
+        expect(options.eq(3).prop('selected')).toEqual(false);
+      });
+    });
+  });
+
+
   describe('selectAs expression', function() {
     beforeEach(function() {
       scope.arr = [{id: 10, label: 'ten'}, {id:20, label: 'twenty'}];
@@ -575,6 +878,54 @@ describe('ngOptions', function() {
     });
 
 
+    it('should re-render if an item in an array source is added/removed', function() {
+      createSelect({
+        'ng-model': 'selected',
+        'multiple': true,
+        'ng-options': 'item.id as item.label for item in arr'
+      });
+
+      scope.$apply(function() {
+        scope.selected = [10];
+      });
+      expect(element).toEqualSelectValue([10], true);
+
+      scope.$apply(function() {
+        scope.selected.push(20);
+      });
+      expect(element).toEqualSelectValue([10, 20], true);
+
+
+      scope.$apply(function() {
+        scope.selected.shift();
+      });
+      expect(element).toEqualSelectValue([20], true);
+    });
+
+
+    it('should handle a options containing circular references', function() {
+      scope.arr[0].ref = scope.arr[0];
+      scope.selected = [scope.arr[0]];
+      createSelect({
+        'ng-model': 'selected',
+        'multiple': true,
+        'ng-options': 'item as item.label for item in arr'
+      });
+      expect(element).toEqualSelectValue([scope.arr[0]], true);
+
+      scope.$apply(function() {
+        scope.selected.push(scope.arr[1]);
+      });
+      expect(element).toEqualSelectValue([scope.arr[0], scope.arr[1]], true);
+
+
+      scope.$apply(function() {
+        scope.selected.pop();
+      });
+      expect(element).toEqualSelectValue([scope.arr[0]], true);
+    });
+
+
     it('should support single select with object source', function() {
       createSelect({
         'ng-model': 'selected',
@@ -655,6 +1006,86 @@ describe('ngOptions', function() {
       expect(options.eq(2)).toEqualTrackedOption(20, 'twenty');
     });
 
+
+    it('should update the selected option even if only the tracked property on the selected object changes (single)', function() {
+      createSelect({
+        'ng-model': 'selected',
+        'ng-options': 'item.label for item in arr track by item.id'
+      });
+
+      scope.$apply(function() {
+        scope.selected = {id: 10, label: 'ten'};
+      });
+
+      expect(element.val()).toEqual('10');
+
+      // Update the properties on the selected object, rather than replacing the whole object
+      scope.$apply(function() {
+        scope.selected.id = 20;
+        scope.selected.label = 'new twenty';
+      });
+
+      // The value of the select should change since the id property changed
+      expect(element.val()).toEqual('20');
+
+      // But the label of the selected option does not change
+      var option = element.find('option').eq(1);
+      expect(option.prop('selected')).toEqual(true);
+      expect(option.text()).toEqual('twenty'); // not 'new twenty'
+    });
+
+
+    it('should update the selected options even if only the tracked properties on the objects in the ' +
+        'selected collection change (multi)', function() {
+      createSelect({
+        'ng-model': 'selected',
+        'multiple': true,
+        'ng-options': 'item.label for item in arr track by item.id'
+      });
+
+      scope.$apply(function() {
+        scope.selected = [{id: 10, label: 'ten'}];
+      });
+
+      expect(element.val()).toEqual(['10']);
+
+      // Update the tracked property on the object in the selected array, rather than replacing the whole object
+      scope.$apply(function() {
+        scope.selected[0].id = 20;
+      });
+
+      // The value of the select should change since the id property changed
+      expect(element.val()).toEqual(['20']);
+
+      // But the label of the selected option does not change
+      var option = element.find('option').eq(1);
+      expect(option.prop('selected')).toEqual(true);
+      expect(option.text()).toEqual('twenty'); // not 'new twenty'
+    });
+
+
+    it('should prevent changes to the selected object from modifying the options objects (single)', function() {
+
+      createSelect({
+        'ng-model': 'selected',
+        'ng-options': 'item.label for item in arr track by item.id'
+      });
+
+      element.val('10');
+      browserTrigger(element, 'change');
+
+      expect(scope.selected).toEqual(scope.arr[0]);
+
+      scope.$apply(function() {
+        scope.selected.id = 20;
+      });
+
+      expect(scope.selected).not.toEqual(scope.arr[0]);
+      expect(element.val()).toEqual('20');
+      expect(scope.arr).toEqual([{id: 10, label: 'ten'}, {id:20, label: 'twenty'}]);
+    });
+
+
     it('should preserve value even when reference has changed (single&array)', function() {
       createSelect({
         'ng-model': 'selected',
@@ -717,7 +1148,7 @@ describe('ngOptions', function() {
       expect(element.val()).toBe('10');
 
       setSelectValue(element, 1);
-      expect(scope.selected).toBe(scope.obj['2']);
+      expect(scope.selected).toEqual(scope.obj['2']);
     });
 
 
@@ -759,6 +1190,104 @@ describe('ngOptions', function() {
         });
       }).not.toThrow();
     });
+
+    it('should re-render if the tracked property of the model is changed when using trackBy', function() {
+
+      createSelect({
+        'ng-model': 'selected',
+        'ng-options': 'item for item in arr track by item.id'
+      });
+
+      scope.$apply(function() {
+        scope.selected = {id: 10, label: 'ten'};
+      });
+
+      spyOn(element.controller('ngModel'), '$render');
+
+      scope.$apply(function() {
+        scope.arr[0].id = 20;
+      });
+
+      // update render due to equality watch
+      expect(element.controller('ngModel').$render).toHaveBeenCalled();
+
+    });
+
+    it('should not set view value again if the tracked property of the model has not changed when using trackBy', function() {
+
+      createSelect({
+        'ng-model': 'selected',
+        'ng-options': 'item for item in arr track by item.id'
+      });
+
+      scope.$apply(function() {
+        scope.selected = {id: 10, label: 'ten'};
+      });
+
+      spyOn(element.controller('ngModel'), '$setViewValue');
+
+      scope.$apply(function() {
+        scope.arr[0] = {id: 10, label: 'ten'};
+      });
+
+      expect(element.controller('ngModel').$setViewValue).not.toHaveBeenCalled();
+    });
+
+    it('should not re-render if a property of the model is changed when not using trackBy', function() {
+
+      createSelect({
+        'ng-model': 'selected',
+        'ng-options': 'item for item in arr'
+      });
+
+      scope.$apply(function() {
+        scope.selected = scope.arr[0];
+      });
+
+      spyOn(element.controller('ngModel'), '$render');
+
+      scope.$apply(function() {
+        scope.selected.label = 'changed';
+      });
+
+      // no render update as no equality watch
+      expect(element.controller('ngModel').$render).not.toHaveBeenCalled();
+    });
+
+
+    it('should handle options containing circular references (single)', function() {
+      scope.arr[0].ref = scope.arr[0];
+      createSelect({
+        'ng-model': 'selected',
+        'ng-options': 'item for item in arr track by item.id'
+      });
+
+      expect(function() {
+        scope.$apply(function() {
+          scope.selected = scope.arr[0];
+        });
+      }).not.toThrow();
+    });
+
+
+    it('should handle options containing circular references (multiple)', function() {
+      scope.arr[0].ref = scope.arr[0];
+      createSelect({
+        'ng-model': 'selected',
+        'multiple': true,
+        'ng-options': 'item for item in arr track by item.id'
+      });
+
+      expect(function() {
+        scope.$apply(function() {
+          scope.selected = [scope.arr[0]];
+        });
+
+        scope.$apply(function() {
+          scope.selected.push(scope.arr[1]);
+        });
+      }).not.toThrow();
+    });
   });
 
 
@@ -796,7 +1325,7 @@ describe('ngOptions', function() {
 
       element.val('10');
       browserTrigger(element, 'change');
-      expect(scope.selected).toBe(scope.arr[0].subItem);
+      expect(scope.selected).toEqual(scope.arr[0].subItem);
 
       // Now reload the array
       scope.$apply(function() {
@@ -1164,6 +1693,31 @@ describe('ngOptions', function() {
       expect(element).toEqualSelectValue(scope.selected);
     });
 
+    it('should bind to object disabled', function() {
+      scope.selected = 30;
+      scope.options = [
+        { name: 'white', value: '#FFFFFF' },
+        { name: 'one', value: 1, unavailable: true },
+        { name: 'notTrue', value: false },
+        { name: 'thirty', value: 30, unavailable: false }
+      ];
+      createSelect({
+        'ng-options': 'o.value as o.name disable when o.unavailable for o in options',
+        'ng-model': 'selected'
+      });
+
+      var options = element.find('option');
+
+      expect(scope.options[1].unavailable).toEqual(true);
+      expect(options.eq(1).prop('disabled')).toEqual(true);
+
+      scope.$apply(function() {
+        scope.options[1].unavailable = false;
+      });
+
+      expect(scope.options[1].unavailable).toEqual(false);
+      expect(options.eq(1).prop('disabled')).toEqual(false);
+    });
 
     it('should insert a blank option if bound to null', function() {
       createSingleSelect();
@@ -1350,7 +1904,7 @@ describe('ngOptions', function() {
         scope.values.pop();
       });
 
-      expect(element.val()).toEqualUnknownValue();
+      expect(element.val()).toEqual('');
       expect(scope.selected).toEqual(null);
 
       // Check after model change
@@ -1364,7 +1918,7 @@ describe('ngOptions', function() {
         scope.values.pop();
       });
 
-      expect(element.val()).toEqualUnknownValue();
+      expect(element.val()).toEqual('');
       expect(scope.selected).toEqual(null);
     });
 
@@ -1653,6 +2207,37 @@ describe('ngOptions', function() {
       expect(element.find('option')[1].selected).toBeTruthy();
     });
 
+    it('should not write disabled selections from model', function() {
+      scope.selected = [30];
+      scope.options = [
+        { name: 'white', value: '#FFFFFF' },
+        { name: 'one', value: 1, unavailable: true },
+        { name: 'notTrue', value: false },
+        { name: 'thirty', value: 30, unavailable: false }
+      ];
+      createSelect({
+        'ng-options': 'o.value as o.name disable when o.unavailable for o in options',
+        'ng-model': 'selected',
+        'multiple': true
+      });
+
+      var options = element.find('option');
+
+      expect(options.eq(0).prop('selected')).toEqual(false);
+      expect(options.eq(1).prop('selected')).toEqual(false);
+      expect(options.eq(2).prop('selected')).toEqual(false);
+      expect(options.eq(3).prop('selected')).toEqual(true);
+
+      scope.$apply(function() {
+        scope.selected.push(1);
+      });
+
+      expect(options.eq(0).prop('selected')).toEqual(false);
+      expect(options.eq(1).prop('selected')).toEqual(false);
+      expect(options.eq(2).prop('selected')).toEqual(false);
+      expect(options.eq(3).prop('selected')).toEqual(true);
+    });
+
 
     it('should update model on change', function() {
       createMultiSelect();
diff --git a/test/ng/directive/ngRepeatSpec.js b/test/ng/directive/ngRepeatSpec.js
index 1205a8701b9f..0c7070fb5e6d 100644
--- a/test/ng/directive/ngRepeatSpec.js
+++ b/test/ng/directive/ngRepeatSpec.js
@@ -1084,7 +1084,7 @@ describe('ngRepeat', function() {
     beforeEach(function() {
       element = $compile(
         '<ul>' +
-          '<li ng-repeat="item in items">{{key}}:{{val}}|></li>' +
+          '<li ng-repeat="item in items">{{item}}</li>' +
         '</ul>')(scope);
       a = {};
       b = {};
@@ -1462,7 +1462,7 @@ describe('ngRepeat animations', function() {
   }));
 
   it('should not change the position of the block that is being animated away via a leave animation',
-    inject(function($compile, $rootScope, $animate, $document, $window, $sniffer, $timeout) {
+    inject(function($compile, $rootScope, $animate, $document, $window, $sniffer, $timeout, $$rAF) {
       if (!$sniffer.transitions) return;
 
       var item;
@@ -1487,10 +1487,9 @@ describe('ngRepeat animations', function() {
         $rootScope.$digest();
 
         expect(element.text()).toBe('123'); // the original order should be preserved
-        $animate.triggerReflow();
+        $$rAF.flush();
         $timeout.flush(1500); // 1s * 1.5 closing buffer
         expect(element.text()).toBe('13');
-
       } finally {
         ss.destroy();
       }
diff --git a/test/ng/directive/ngStyleSpec.js b/test/ng/directive/ngStyleSpec.js
index 89056f539326..4d1ef2069bea 100644
--- a/test/ng/directive/ngStyleSpec.js
+++ b/test/ng/directive/ngStyleSpec.js
@@ -23,6 +23,15 @@ describe('ngStyle', function() {
   }));
 
 
+  it('should support lazy one-time binding for object literals', inject(function($rootScope, $compile) {
+    element = $compile('<div ng-style="::{height: heightStr}"></div>')($rootScope);
+    $rootScope.$digest();
+    expect(parseInt(element.css('height') + 0)).toEqual(0); // height could be '' or '0px'
+    $rootScope.$apply('heightStr = "40px"');
+    expect(element.css('height')).toBe('40px');
+  }));
+
+
   describe('preserving styles set before and after compilation', function() {
     var scope, preCompStyle, preCompVal, postCompStyle, postCompVal, element;
 
diff --git a/test/ng/directive/selectSpec.js b/test/ng/directive/selectSpec.js
index 725c87ddec97..3aca6176ec97 100644
--- a/test/ng/directive/selectSpec.js
+++ b/test/ng/directive/selectSpec.js
@@ -200,6 +200,70 @@ describe('select', function() {
 
     describe('empty option', function() {
 
+      it('should allow empty option to be added and removed dynamically', function() {
+
+        scope.dynamicOptions = [];
+        scope.robot = '';
+        compile('<select ng-model="robot">' +
+                  '<option ng-repeat="opt in dynamicOptions" value="{{opt.val}}">{{opt.display}}</option>' +
+                '</selec>');
+        expect(element).toEqualSelect(['? string: ?']);
+
+
+        scope.dynamicOptions = [
+          { val: '', display: '--select--' },
+          { val: 'x', display: 'robot x' },
+          { val: 'y', display: 'robot y' }
+        ];
+        scope.$digest();
+        expect(element).toEqualSelect([''], 'x', 'y');
+
+
+        scope.robot = 'x';
+        scope.$digest();
+        expect(element).toEqualSelect('', ['x'], 'y');
+
+
+        scope.dynamicOptions.shift();
+        scope.$digest();
+        expect(element).toEqualSelect(['x'], 'y');
+
+
+        scope.robot = undefined;
+        scope.$digest();
+        expect(element).toEqualSelect([unknownValue(undefined)], 'x', 'y');
+      });
+
+
+    it('should cope with a dynamic empty option added to a static empty option', function() {
+        scope.dynamicOptions = [];
+        scope.robot = 'x';
+        compile('<select ng-model="robot">' +
+                  '<option value="">--static-select--</option>' +
+                  '<option ng-repeat="opt in dynamicOptions" value="{{opt.val}}">{{opt.display}}</option>' +
+                '</selec>');
+        scope.$digest();
+        expect(element).toEqualSelect([unknownValue('x')], '');
+
+        scope.robot = undefined;
+        scope.$digest();
+        expect(element.find('option').eq(0).prop('selected')).toBe(true);
+        expect(element.find('option').eq(0).text()).toBe('--static-select--');
+
+        scope.dynamicOptions = [
+          { val: '', display: '--dynamic-select--' },
+          { val: 'x', display: 'robot x' },
+          { val: 'y', display: 'robot y' }
+        ];
+        scope.$digest();
+        expect(element).toEqualSelect([''], '', 'x', 'y');
+
+
+        scope.dynamicOptions = [];
+        scope.$digest();
+        expect(element).toEqualSelect(['']);
+    });
+
       it('should select the empty option when model is undefined', function() {
         compile('<select ng-model="robot">' +
                   '<option value="">--select--</option>' +
@@ -237,6 +301,23 @@ describe('select', function() {
       });
 
 
+      it('should remove unknown option when model is undefined', function() {
+        scope.robot = 'other';
+        compile('<select ng-model="robot">' +
+                  '<option value="">--select--</option>' +
+                  '<option value="x">robot x</option>' +
+                  '<option value="y">robot y</option>' +
+                '</select>');
+
+        expect(element).toEqualSelect([unknownValue('other')], '', 'x', 'y');
+
+        scope.robot = undefined;
+        scope.$digest();
+
+        expect(element).toEqualSelect([''], 'x', 'y');
+      });
+
+
       describe('interactions with repeated options', function() {
 
         it('should select empty option when model is undefined', function() {
@@ -323,7 +404,7 @@ describe('select', function() {
         scope.$apply(function() {
           scope.robot = null;
         });
-        expect(element).toEqualSelect([unknownValue(null)], '', 'c3p0', 'r2d2');
+        expect(element).toEqualSelect([''], 'c3p0', 'r2d2');
 
         scope.$apply(function() {
           scope.robot = 'r2d2';
@@ -824,6 +905,60 @@ describe('select', function() {
       expect(element).toBeDirty();
     });
 
+
+    describe('calls to $render', function() {
+
+      var ngModelCtrl;
+
+      beforeEach(function() {
+        compile(
+          '<select name="select" ng-model="selection" multiple>' +
+          '<option>A</option>' +
+          '<option>B</option>' +
+          '</select>');
+
+        ngModelCtrl = element.controller('ngModel');
+        spyOn(ngModelCtrl, '$render').andCallThrough();
+      });
+
+
+      it('should call $render once when the reference to the viewValue changes', function() {
+        scope.$apply(function() {
+          scope.selection = ['A'];
+        });
+        expect(ngModelCtrl.$render.calls.length).toBe(1);
+
+        scope.$apply(function() {
+          scope.selection = ['A', 'B'];
+        });
+        expect(ngModelCtrl.$render.calls.length).toBe(2);
+
+        scope.$apply(function() {
+          scope.selection = [];
+        });
+        expect(ngModelCtrl.$render.calls.length).toBe(3);
+      });
+
+
+      it('should call $render once when the viewValue deep-changes', function() {
+        scope.$apply(function() {
+          scope.selection = ['A'];
+        });
+        expect(ngModelCtrl.$render.calls.length).toBe(1);
+
+        scope.$apply(function() {
+          scope.selection.push('B');
+        });
+        expect(ngModelCtrl.$render.calls.length).toBe(2);
+
+        scope.$apply(function() {
+          scope.selection.length = 0;
+        });
+        expect(ngModelCtrl.$render.calls.length).toBe(3);
+      });
+
+    });
+
   });
 
 
diff --git a/test/ng/directive/styleSpec.js b/test/ng/directive/styleSpec.js
index 36f15cde1ebb..b42844be21c7 100644
--- a/test/ng/directive/styleSpec.js
+++ b/test/ng/directive/styleSpec.js
@@ -14,8 +14,7 @@ describe('style', function() {
     $compile(element)($rootScope);
     $rootScope.$digest();
 
-    // read innerHTML and trim to pass on IE8
-    expect(trim(element[0].innerHTML)).toBe('.header{font-size:1.5em; h3{font-size:1.5em}}');
+    expect(element[0].innerHTML).toBe('.header{font-size:1.5em; h3{font-size:1.5em}}');
   }));
 
 
@@ -24,15 +23,13 @@ describe('style', function() {
     $compile(element)($rootScope);
     $rootScope.$digest();
 
-    // read innerHTML and trim to pass on IE8
-    expect(trim(element[0].innerHTML)).toBe('.some-container{ width: px; }');
+    expect(element[0].innerHTML).toBe('.some-container{ width: px; }');
 
     $rootScope.$apply(function() {
       $rootScope.elementWidth = 200;
     });
 
-    // read innerHTML and trim to pass on IE8
-    expect(trim(element[0].innerHTML)).toBe('.some-container{ width: 200px; }');
+    expect(element[0].innerHTML).toBe('.some-container{ width: 200px; }');
   }));
 
 
@@ -41,15 +38,13 @@ describe('style', function() {
     $compile(element)($rootScope);
     $rootScope.$digest();
 
-    // read innerHTML and trim to pass on IE8
-    expect(trim(element[0].innerHTML)).toBe('.header{ h3 { font-size: em }}');
+    expect(element[0].innerHTML).toBe('.header{ h3 { font-size: em }}');
 
     $rootScope.$apply(function() {
       $rootScope.fontSize = 1.5;
     });
 
-    // read innerHTML and trim to pass on IE8
-    expect(trim(element[0].innerHTML)).toBe('.header{ h3 { font-size: 1.5em }}');
+    expect(element[0].innerHTML).toBe('.header{ h3 { font-size: 1.5em }}');
   }));
 
 
@@ -58,16 +53,14 @@ describe('style', function() {
     $compile(element)($rootScope);
     $rootScope.$digest();
 
-    // read innerHTML and trim to pass on IE8
-    expect(trim(element[0].innerHTML)).toBe('.header{ h3 { font-size:  }}');
+    expect(element[0].innerHTML).toBe('.header{ h3 { font-size:  }}');
 
     $rootScope.$apply(function() {
       $rootScope.fontSize = 1.5;
       $rootScope.unit = 'em';
     });
 
-    // read innerHTML and trim to pass on IE8
-    expect(trim(element[0].innerHTML)).toBe('.header{ h3 { font-size: 1.5em }}');
+    expect(element[0].innerHTML).toBe('.header{ h3 { font-size: 1.5em }}');
   }));
 
 
diff --git a/test/ng/documentSpec.js b/test/ng/documentSpec.js
index 064904a26db0..3fbca1d7a048 100644
--- a/test/ng/documentSpec.js
+++ b/test/ng/documentSpec.js
@@ -6,4 +6,24 @@ describe('$document', function() {
   it("should inject $document", inject(function($document) {
     expect($document).toEqual(jqLite(document));
   }));
+
+
+  it('should be able to mock $document object', function() {
+    module({$document: {}});
+    inject(function($httpBackend, $http) {
+      $httpBackend.expectGET('/dummy').respond('dummy');
+      $http.get('/dummy');
+      $httpBackend.flush();
+    });
+  });
+
+
+  it('should be able to mock $document array', function() {
+    module({$document: [{}]});
+    inject(function($httpBackend, $http) {
+      $httpBackend.expectGET('/dummy').respond('dummy');
+      $http.get('/dummy');
+      $httpBackend.flush();
+    });
+  });
 });
diff --git a/test/ng/filter/filterSpec.js b/test/ng/filter/filterSpec.js
index 0318ae57bcf6..25928d89b6c4 100644
--- a/test/ng/filter/filterSpec.js
+++ b/test/ng/filter/filterSpec.js
@@ -48,6 +48,15 @@ describe('Filter: filter', function() {
   });
 
 
+  it('should ignore undefined properties of the expression object', function() {
+    var items = [{name: 'a'}, {name: 'abc'}];
+    expect(filter(items, {name: undefined})).toEqual([{name: 'a'}, {name: 'abc'}]);
+
+    items = [{first: 'misko'}, {deep: {first: 'misko'}}, {deep: {last: 'hevery'}}];
+    expect(filter(items, {deep: {first: undefined}})).toEqual([{deep: {first: 'misko'}}, {deep: {last: 'hevery'}}]);
+  });
+
+
   it('should take function as predicate', function() {
     var items = [{name: 'a'}, {name: 'abc', done: true}];
     expect(filter(items, function(i) {return i.done;}).length).toBe(1);
@@ -416,6 +425,23 @@ describe('Filter: filter', function() {
       toThrowMinErr('filter', 'notarray', 'Expected array but received: {"toString":null,"valueOf":null}');
   });
 
+  it('should not throw an error if used with an array like object', function() {
+    function getArguments() {
+      return arguments;
+    }
+    var argsObj = getArguments({name: 'Misko'}, {name: 'Igor'}, {name: 'Brad'});
+
+    var nodeList = jqLite("<p><span>Misko</span><span>Igor</span><span>Brad</span></p>")[0].childNodes;
+    function nodeFilterPredicate(node) {
+      return node.innerHTML.indexOf("I") !== -1;
+    }
+
+    expect(filter(argsObj, 'i').length).toBe(2);
+    expect(filter('abc','b').length).toBe(1);
+    expect(filter(nodeList, nodeFilterPredicate).length).toBe(1);
+
+  });
+
 
   it('should return undefined when the array is undefined', function() {
     expect(filter(undefined, {})).toBeUndefined();
@@ -428,15 +454,128 @@ describe('Filter: filter', function() {
   });
 
 
+  it('should not throw an error if property is null when comparing object', function() {
+    var items = [
+        { office:1, people: {name:'john'}},
+        { office:2, people: {name:'jane'}},
+        { office:3, people: null}
+    ];
+    var f = { };
+    expect(filter(items, f).length).toBe(3);
+
+    f = { people:null };
+    expect(filter(items, f).length).toBe(1);
+
+    f = { people: {}};
+    expect(filter(items, f).length).toBe(2);
+
+    f = { people:{ name: '' }};
+    expect(filter(items, f).length).toBe(2);
+
+    f = { people:{ name:'john' }};
+    expect(filter(items, f).length).toBe(1);
+
+    f = { people:{ name:'j' }};
+    expect(filter(items, f).length).toBe(2);
+  });
+
+
+  it('should match `null` against `null` only', function() {
+    var items = [
+      {value: null},
+      {value: undefined},
+      {value: true},
+      {value: false},
+      {value: NaN},
+      {value: 42},
+      {value: 'null'},
+      {value: 'test'},
+      {value: {}},
+      {value: new Date()}
+    ];
+    var flt;
+
+    flt = null;
+    expect(filter(items, flt).length).toBe(1);
+    expect(filter(items, flt)[0]).toBe(items[0]);
+
+    flt = {value: null};
+    expect(filter(items, flt).length).toBe(1);
+    expect(filter(items, flt)[0]).toBe(items[0]);
+
+    flt = {value: undefined};
+    expect(filter(items, flt).length).toBe(items.length);
+
+    flt = {value: NaN};
+    expect(includes(filter(items, flt), items[0])).toBeFalsy();
+
+    flt = {value: false};
+    expect(includes(filter(items, flt), items[0])).toBeFalsy();
+
+    flt = '';
+    expect(includes(filter(items, flt), items[0])).toBeFalsy();
+
+    flt = {value: 'null'};
+    expect(includes(filter(items, flt), items[0])).toBeFalsy();
+  });
+
+
   describe('should support comparator', function() {
 
-    it('not consider `object === "[object Object]"` in non-strict comparison', function() {
+    it('not convert `null` or `undefined` to string in non-strict comparison', function() {
+      var items = [
+        {value: null},
+        {value: undefined}
+      ];
+      var flt = {value: 'u'};
+
+      expect(filter(items, flt).length).toBe(0);
+    });
+
+
+    it('not consider objects without a custom `toString` in non-strict comparison', function() {
       var items = [{test: {}}];
       var expr = '[object';
       expect(filter(items, expr).length).toBe(0);
     });
 
 
+    it('should consider objects with custom `toString()` in non-strict comparison', function() {
+      var obj = new Date(1970, 0);
+      var items = [{test: obj}];
+      expect(filter(items, '1970').length).toBe(1);
+      expect(filter(items, 1970).length).toBe(1);
+
+      obj = {
+        toString: function() { return 'custom'; }
+      };
+      items = [{test: obj}];
+      expect(filter(items, 'custom').length).toBe(1);
+    });
+
+
+    it('should cope with objects that have no `toString()` in non-strict comparison', function() {
+      var obj = Object.create(null);
+      var items = [{test: obj}];
+      expect(function() {
+        filter(items, 'foo');
+      }).not.toThrow();
+      expect(filter(items, 'foo').length).toBe(0);
+    });
+
+
+    it('should cope with objects where `toString` is not a function in non-strict comparison', function() {
+      var obj = {
+        toString: 'moo'
+      };
+      var items = [{test: obj}];
+      expect(function() {
+        filter(items, 'foo');
+      }).not.toThrow();
+      expect(filter(items, 'foo').length).toBe(0);
+    });
+
+
     it('as equality when true', function() {
       var items = ['misko', 'adam', 'adamson'];
       var expr = 'adam';
diff --git a/test/ng/filter/filtersSpec.js b/test/ng/filter/filtersSpec.js
index bd101b432882..52ad6fbd6a4d 100644
--- a/test/ng/filter/filtersSpec.js
+++ b/test/ng/filter/filtersSpec.js
@@ -101,7 +101,7 @@ describe('filters', function() {
 
     it('should do basic currency filtering', function() {
       expect(currency(0)).toEqual('$0.00');
-      expect(currency(-999)).toEqual('($999.00)');
+      expect(currency(-999)).toEqual('-$999.00');
       expect(currency(1234.5678, "USD$")).toEqual('USD$1,234.57');
       expect(currency(1234.5678, "USD$", 0)).toEqual('USD$1,235');
     });
@@ -298,6 +298,18 @@ describe('filters', function() {
 
       expect(date(earlyDate, "MMMM dd, y")).
                       toEqual('September 03, 1');
+
+      expect(date(noon, "MMMM dd, y G")).
+                      toEqual('September 03, 2010 AD');
+
+      expect(date(noon, "MMMM dd, y GG")).
+                      toEqual('September 03, 2010 AD');
+
+      expect(date(noon, "MMMM dd, y GGG")).
+                      toEqual('September 03, 2010 AD');
+
+      expect(date(noon, "MMMM dd, y GGGG")).
+                      toEqual('September 03, 2010 Anno Domini');
     });
 
     it('should accept negative numbers as strings', function() {
@@ -464,8 +476,8 @@ describe('filters', function() {
     });
 
     it('should fallback to default timezone in case an unknown timezone was passed', function() {
-      var value = new angular.mock.TzDate(-2, '2003-09-10T01:02:04.000Z');
-      expect(date(value, 'yyyy-MM-dd HH-mm-ssZ', 'WTF')).toEqual('2003-09-10 03-02-04+0200');
+      var value = new Date(2003, 8, 10, 3, 2, 4);
+      expect(date(value, 'yyyy-MM-dd HH-mm-ssZ', 'WTF')).toEqual(date(value, 'yyyy-MM-dd HH-mm-ssZ'));
     });
   });
 });
diff --git a/test/ng/filter/limitToSpec.js b/test/ng/filter/limitToSpec.js
index a15fbbc58556..343290a55c5d 100644
--- a/test/ng/filter/limitToSpec.js
+++ b/test/ng/filter/limitToSpec.js
@@ -23,6 +23,19 @@ describe('Filter: limitTo', function() {
     expect(limitTo(number, '3')).toEqual("100");
   });
 
+  it('should return the first X items beginning from index Y when X and Y are positive', function() {
+    expect(limitTo(items, 3, '3')).toEqual(['d', 'e', 'f']);
+    expect(limitTo(items, '3', 3)).toEqual(['d', 'e', 'f']);
+    expect(limitTo(str, 3, 3)).toEqual("wxy");
+    expect(limitTo(str, '3', '3')).toEqual("wxy");
+  });
+
+  it('should return the first X items beginning from index Y when X is positive and Y is negative', function() {
+    expect(limitTo(items, 3, '-3')).toEqual(['f', 'g', 'h']);
+    expect(limitTo(items, '3', -3)).toEqual(['f', 'g', 'h']);
+    expect(limitTo(str, 3, -3)).toEqual("xyz");
+    expect(limitTo(str, '3', '-3')).toEqual("xyz");
+  });
 
   it('should return the last X items when X is negative', function() {
     expect(limitTo(items, -3)).toEqual(['f', 'g', 'h']);
@@ -33,6 +46,19 @@ describe('Filter: limitTo', function() {
     expect(limitTo(number, '-3')).toEqual("045");
   });
 
+  it('should return the last X items until index Y when X and Y are negative', function() {
+    expect(limitTo(items, -3, '-3')).toEqual(['c', 'd', 'e']);
+    expect(limitTo(items, '-3', -3)).toEqual(['c', 'd', 'e']);
+    expect(limitTo(str, -3, -3)).toEqual("uvw");
+    expect(limitTo(str, '-3', '-3')).toEqual("uvw");
+  });
+
+  it('should return the last X items until index Y when X is negative and Y is positive', function() {
+    expect(limitTo(items, -3, '4')).toEqual(['b', 'c', 'd']);
+    expect(limitTo(items, '-3', 4)).toEqual(['b', 'c', 'd']);
+    expect(limitTo(str, -3, 4)).toEqual("uvw");
+    expect(limitTo(str, '-3', '4')).toEqual("uvw");
+  });
 
   it('should return an empty array when X = 0', function() {
     expect(limitTo(items, 0)).toEqual([]);
@@ -60,6 +86,18 @@ describe('Filter: limitTo', function() {
     expect(limitTo(str, undefined)).toEqual(str);
   });
 
+  it('should take 0 as beginning index value when Y cannot be parsed', function() {
+    expect(limitTo(items, 3, 'bogus')).toEqual(limitTo(items, 3, 0));
+    expect(limitTo(items, -3, 'null')).toEqual(limitTo(items, -3));
+    expect(limitTo(items, '3', 'undefined')).toEqual(limitTo(items, '3', 0));
+    expect(limitTo(items, '-3', null)).toEqual(limitTo(items, '-3'));
+    expect(limitTo(items, 3, undefined)).toEqual(limitTo(items, 3, 0));
+    expect(limitTo(str, 3, 'bogus')).toEqual(limitTo(str, 3));
+    expect(limitTo(str, -3, 'null')).toEqual(limitTo(str, -3, 0));
+    expect(limitTo(str, '3', 'undefined')).toEqual(limitTo(str, '3'));
+    expect(limitTo(str, '-3', null)).toEqual(limitTo(str, '-3', 0));
+    expect(limitTo(str, 3, undefined)).toEqual(limitTo(str, 3));
+  });
 
   it('should return input if not String or Array or Number', function() {
     expect(limitTo(null, 1)).toEqual(null);
@@ -99,4 +137,32 @@ describe('Filter: limitTo', function() {
     expect(limitTo(str, -Infinity)).toEqual(str);
     expect(limitTo(str, '-Infinity')).toEqual(str);
   });
+
+  it('should return an empty array if Y exceeds input length', function() {
+    expect(limitTo(items, '3', 12)).toEqual([]);
+    expect(limitTo(items, 4, '-12')).toEqual([]);
+    expect(limitTo(items, -3, '12')).toEqual([]);
+    expect(limitTo(items, '-4', -12)).toEqual([]);
+  });
+
+  it('should return an empty string if Y exceeds input length', function() {
+    expect(limitTo(str, '3', 12)).toEqual("");
+    expect(limitTo(str, 4, '-12')).toEqual("");
+    expect(limitTo(str, -3, '12')).toEqual("");
+    expect(limitTo(str, '-4', -12)).toEqual("");
+  });
+
+  it('should return the entire string beginning from Y if X is positive and X+Y exceeds input length', function() {
+    expect(limitTo(items, 7, 3)).toEqual(['d', 'e', 'f', 'g', 'h']);
+    expect(limitTo(items, 7, -3)).toEqual(['f', 'g', 'h']);
+    expect(limitTo(str, 6, 3)).toEqual("wxyz");
+    expect(limitTo(str, 6, -3)).toEqual("xyz");
+  });
+
+  it('should return the entire string until index Y if X is negative and X+Y exceeds input length', function() {
+    expect(limitTo(items, -7, 3)).toEqual(['a', 'b', 'c']);
+    expect(limitTo(items, -7, -3)).toEqual(['a', 'b', 'c', 'd', 'e']);
+    expect(limitTo(str, -6, 3)).toEqual("tuv");
+    expect(limitTo(str, -6, -3)).toEqual("tuvw");
+  });
 });
diff --git a/test/ng/filter/orderBySpec.js b/test/ng/filter/orderBySpec.js
index 17cd6b47dbb4..9edec1532cd3 100644
--- a/test/ng/filter/orderBySpec.js
+++ b/test/ng/filter/orderBySpec.js
@@ -23,7 +23,7 @@ describe('Filter: orderBy', function() {
     });
 
 
-    it('shouldSortArrayInReverse', function() {
+    it('should reverse collection if `reverseOrder` param is truthy', function() {
       expect(orderBy([{a:15}, {a:2}], 'a', true)).toEqualData([{a:15}, {a:2}]);
       expect(orderBy([{a:15}, {a:2}], 'a', "T")).toEqualData([{a:15}, {a:2}]);
       expect(orderBy([{a:15}, {a:2}], 'a', "reverse")).toEqualData([{a:15}, {a:2}]);
@@ -116,7 +116,7 @@ describe('Filter: orderBy', function() {
     });
 
 
-    it('should not reverse array of objects with no predicate', function() {
+    it('should not reverse array of objects with no predicate and reverse is not `true`', function() {
       var array = [
         { id: 2 },
         { id: 1 },
@@ -126,6 +126,39 @@ describe('Filter: orderBy', function() {
       expect(orderBy(array)).toEqualData(array);
     });
 
+    it('should reverse array of objects with no predicate and reverse is `true`', function() {
+      var array = [
+        { id: 2 },
+        { id: 1 },
+        { id: 4 },
+        { id: 3 }
+      ];
+      var reversedArray = [
+        { id: 3 },
+        { id: 4 },
+        { id: 1 },
+        { id: 2 }
+      ];
+      expect(orderBy(array, '', true)).toEqualData(reversedArray);
+    });
+
+
+    it('should reverse array of objects with predicate of "-"', function() {
+      var array = [
+        { id: 2 },
+        { id: 1 },
+        { id: 4 },
+        { id: 3 }
+      ];
+      var reversedArray = [
+        { id: 3 },
+        { id: 4 },
+        { id: 1 },
+        { id: 2 }
+      ];
+      expect(orderBy(array, '-')).toEqualData(reversedArray);
+    });
+
 
     it('should not reverse array of objects with null prototype and no predicate', function() {
       var array = [2,1,4,3].map(function(id) {
@@ -151,6 +184,16 @@ describe('Filter: orderBy', function() {
         null
       ]);
     });
+
+
+    it('should sort array of arrays as Array.prototype.sort', function() {
+      expect(orderBy([['one'], ['two'], ['three']])).toEqualData([['one'], ['three'], ['two']]);
+    });
+
+
+    it('should sort mixed array of objects and values in a stable way', function() {
+      expect(orderBy([{foo: 2}, {foo: {}}, {foo: 3}, {foo: 4}], 'foo')).toEqualData([{foo: 2}, {foo: 3}, {foo: 4}, {foo: {}}]);
+    });
   });
 
 
diff --git a/test/ng/forceReflowSpec.js b/test/ng/forceReflowSpec.js
new file mode 100644
index 000000000000..6a1885791635
--- /dev/null
+++ b/test/ng/forceReflowSpec.js
@@ -0,0 +1,52 @@
+'use strict';
+
+describe('$$forceReflow', function() {
+  it('should issue a reflow by touching the `document.body.client` when no param is provided', function() {
+    module(function($provide) {
+      var doc = jqLite('<div></div>');
+      doc[0].body = {};
+      doc[0].body.offsetWidth = 10;
+      $provide.value('$document', doc);
+    });
+    inject(function($$forceReflow) {
+      var value = $$forceReflow();
+      expect(value).toBe(11);
+    });
+  });
+
+  it('should issue a reflow by touching the `domNode.offsetWidth` when a domNode param is provided',
+    inject(function($$forceReflow) {
+
+    var elm = {};
+    elm.offsetWidth = 100;
+    expect($$forceReflow(elm)).toBe(101);
+  }));
+
+  it('should issue a reflow by touching the `jqLiteNode[0].offsetWidth` when a jqLite node param is provided',
+    inject(function($$forceReflow) {
+
+    var elm = {};
+    elm.offsetWidth = 200;
+    elm = jqLite(elm);
+    expect($$forceReflow(elm)).toBe(201);
+  }));
+
+  describe('$animate with ngAnimateMock', function() {
+    beforeEach(module('ngAnimateMock'));
+
+    it('should keep track of how many reflows have been issued',
+      inject(function($$forceReflow, $animate) {
+
+      var elm = {};
+      elm.offsetWidth = 10;
+
+      expect($animate.reflows).toBe(0);
+
+      $$forceReflow(elm);
+      $$forceReflow(elm);
+      $$forceReflow(elm);
+
+      expect($animate.reflows).toBe(3);
+    }));
+  });
+});
diff --git a/test/ng/httpBackendSpec.js b/test/ng/httpBackendSpec.js
index 12ceed5beb01..bd7f4b8f1859 100644
--- a/test/ng/httpBackendSpec.js
+++ b/test/ng/httpBackendSpec.js
@@ -50,6 +50,23 @@ describe('$httpBackend', function() {
     expect(xhr.$$data).toBe(null);
   });
 
+  it('should pass the correct falsy value to send if falsy body is set (excluding NaN)', function() {
+    var values = [false, 0, "", null, undefined];
+    angular.forEach(values, function(value) {
+      $backend('GET', '/some-url', value, noop);
+      xhr = MockXhr.$$lastInstance;
+
+      expect(xhr.$$data).toBe(value);
+    });
+  });
+
+  it('should pass NaN to send if NaN body is set', function() {
+    $backend('GET', '/some-url', NaN, noop);
+    xhr = MockXhr.$$lastInstance;
+
+    expect(isNaN(xhr.$$data)).toEqual(true);
+  });
+
   it('should call completion function with xhr.statusText if present', function() {
     callback.andCallFake(function(status, response, headers, statusText) {
       expect(statusText).toBe('OK');
@@ -235,7 +252,7 @@ describe('$httpBackend', function() {
 
 
     it('should read responseText if response was not defined', function() {
-      //  old browsers like IE8, don't support responseType, so they always respond with responseText
+      //  old browsers like IE9, don't support responseType, so they always respond with responseText
 
       $backend('GET', '/whatever', null, callback, {}, null, null, 'blob');
 
diff --git a/test/ng/httpSpec.js b/test/ng/httpSpec.js
index e3096edbb1b4..70e0d71cbae3 100644
--- a/test/ng/httpSpec.js
+++ b/test/ng/httpSpec.js
@@ -2,12 +2,24 @@
 
 describe('$http', function() {
 
-  var callback;
+  var callback, mockedCookies;
+  var customParamSerializer = function(params) {
+    return Object.keys(params).join('_');
+  };
 
   beforeEach(function() {
     callback = jasmine.createSpy('done');
+    mockedCookies = {};
+    module({
+      $$cookieReader: function() {
+        return mockedCookies;
+      }
+    });
   });
 
+  beforeEach(module({
+    customParamSerializer: customParamSerializer
+  }));
   beforeEach(module(function($exceptionHandlerProvider) {
     $exceptionHandlerProvider.mode('log');
   }));
@@ -218,13 +230,16 @@ describe('$http', function() {
           });
         });
         inject(function($http, $httpBackend, $rootScope) {
-          var config = { method: 'get', url: '/url', headers: { foo: 'bar'} };
+          var config = { headers: { foo: 'bar'} };
+          var configCopy = angular.copy(config);
           $httpBackend.expect('GET', '/intercepted').respond('');
-          $http.get('/url');
+          $http.get('/url', config);
+          $rootScope.$apply();
+          expect(config).toEqual(configCopy);
+          $httpBackend.expect('POST', '/intercepted').respond('');
+          $http.post('/url', {bar: 'baz'}, config);
           $rootScope.$apply();
-          expect(config.method).toEqual('get');
-          expect(config.url).toEqual('/url');
-          expect(config.headers.foo).toEqual('bar');
+          expect(config).toEqual(configCopy);
         });
       });
 
@@ -348,6 +363,20 @@ describe('$http', function() {
         $httpBackend.expect('GET', '/url?date=2014-07-15T17:30:00.000Z').respond('');
         $http({url: '/url', params: {date:new Date('2014-07-15T17:30:00.000Z')}, method: 'GET'});
       });
+
+
+      describe('custom params serialization', function() {
+
+        it('should allow specifying custom paramSerializer as function', function() {
+          $httpBackend.expect('GET', '/url?foo_bar').respond('');
+          $http({url: '/url', params: {foo: 'fooVal', bar: 'barVal'}, paramSerializer: customParamSerializer});
+        });
+
+        it('should allow specifying custom paramSerializer as function from DI', function() {
+          $httpBackend.expect('GET', '/url?foo_bar').respond('');
+          $http({url: '/url', params: {foo: 'fooVal', bar: 'barVal'}, paramSerializer: 'customParamSerializer'});
+        });
+      });
     });
 
 
@@ -428,6 +457,34 @@ describe('$http', function() {
           var httpPromise = $http({url: '/url', method: 'GET'});
           expect(httpPromise.success(callback)).toBe(httpPromise);
         });
+
+
+        it('should error if the callback is not a function', function() {
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).success();
+          }).toThrowMinErr('ng', 'areq');
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).success(undefined);
+          }).toThrowMinErr('ng', 'areq');
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).success(null);
+          }).toThrowMinErr('ng', 'areq');
+
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).success({});
+          }).toThrowMinErr('ng', 'areq');
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).success([]);
+          }).toThrowMinErr('ng', 'areq');
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).success('error');
+          }).toThrowMinErr('ng', 'areq');
+        });
       });
 
 
@@ -452,6 +509,34 @@ describe('$http', function() {
           var httpPromise = $http({url: '/url', method: 'GET'});
           expect(httpPromise.error(callback)).toBe(httpPromise);
         });
+
+
+        it('should error if the callback is not a function', function() {
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).error();
+          }).toThrowMinErr('ng', 'areq');
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).error(undefined);
+          }).toThrowMinErr('ng', 'areq');
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).error(null);
+          }).toThrowMinErr('ng', 'areq');
+
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).error({});
+          }).toThrowMinErr('ng', 'areq');
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).error([]);
+          }).toThrowMinErr('ng', 'areq');
+
+          expect(function() {
+            $http({url: '/url', method: 'GET'}).error('error');
+          }).toThrowMinErr('ng', 'areq');
+        });
       });
     });
 
@@ -691,7 +776,7 @@ describe('$http', function() {
       });
 
       it('should not set XSRF cookie for cross-domain requests', inject(function($browser) {
-        $browser.cookies('XSRF-TOKEN', 'secret');
+        mockedCookies['XSRF-TOKEN'] =  'secret';
         $browser.url('http://host.com/base');
         $httpBackend.expect('GET', 'http://www.test.com/url', undefined, function(headers) {
           return headers['X-XSRF-TOKEN'] === undefined;
@@ -733,15 +818,15 @@ describe('$http', function() {
         $httpBackend.flush();
       });
 
-      it('should set the XSRF cookie into a XSRF header', inject(function($browser) {
+      it('should set the XSRF cookie into a XSRF header', inject(function() {
         function checkXSRF(secret, header) {
           return function(headers) {
             return headers[header || 'X-XSRF-TOKEN'] == secret;
           };
         }
 
-        $browser.cookies('XSRF-TOKEN', 'secret');
-        $browser.cookies('aCookie', 'secret2');
+        mockedCookies['XSRF-TOKEN'] =  'secret';
+        mockedCookies['aCookie'] = 'secret2';
         $httpBackend.expect('GET', '/url', undefined, checkXSRF('secret')).respond('');
         $httpBackend.expect('POST', '/url', undefined, checkXSRF('secret')).respond('');
         $httpBackend.expect('PUT', '/url', undefined, checkXSRF('secret')).respond('');
@@ -809,23 +894,18 @@ describe('$http', function() {
         expect(config.foo).toBeUndefined();
       });
 
-      it('should check the cache before checking the XSRF cookie', inject(function($browser, $cacheFactory) {
-        var testCache = $cacheFactory('testCache'),
-            executionOrder = [];
+      it('should check the cache before checking the XSRF cookie', inject(function($cacheFactory) {
+        var testCache = $cacheFactory('testCache');
 
-        spyOn($browser, 'cookies').andCallFake(function() {
-          executionOrder.push('cookies');
-          return {'XSRF-TOKEN':'foo'};
-        });
         spyOn(testCache, 'get').andCallFake(function() {
-          executionOrder.push('cache');
+          mockedCookies['XSRF-TOKEN'] = 'foo';
         });
 
-        $httpBackend.expect('GET', '/url', undefined).respond('');
+        $httpBackend.expect('GET', '/url', undefined, function(headers) {
+          return headers['X-XSRF-TOKEN'] === 'foo';
+        }).respond('');
         $http({url: '/url', method: 'GET', cache: testCache});
         $httpBackend.flush();
-
-        expect(executionOrder).toEqual(['cache', 'cookies']);
       }));
     });
 
@@ -1038,6 +1118,35 @@ describe('$http', function() {
           expect(callback).toHaveBeenCalledOnce();
         });
 
+        it('should have access to request headers with mixed case', function() {
+          $httpBackend.expect('POST', '/url', 'header1').respond(200);
+          $http.post('/url', 'req', {
+            headers: {H1: 'header1'},
+            transformRequest: function(data, headers) {
+              return headers('H1');
+            }
+          }).success(callback);
+          $httpBackend.flush();
+
+          expect(callback).toHaveBeenCalledOnce();
+        });
+
+        it('should not allow modifications to headers in a transform functions', function() {
+          var config = {
+            headers: {'Accept': 'bar'},
+            transformRequest: function(data, headers) {
+              angular.extend(headers(), {
+                'Accept': 'foo'
+              });
+            }
+          };
+
+          $httpBackend.expect('GET', '/url', undefined, {Accept: 'bar'}).respond(200);
+          $http.get('/url', config).success(callback);
+          $httpBackend.flush();
+
+          expect(callback).toHaveBeenCalledOnce();
+        });
 
         it('should pipeline more functions', function() {
           function first(d, h) {return d + '-first' + ':' + h('h1');}
@@ -1719,11 +1828,16 @@ describe('$http', function() {
         $httpBackend.flush();
       });
 
-      it('should have separate opbjects for defaults PUT and POST', function() {
+      it('should have separate objects for defaults PUT and POST', function() {
         expect($http.defaults.headers.post).not.toBe($http.defaults.headers.put);
         expect($http.defaults.headers.post).not.toBe($http.defaults.headers.patch);
         expect($http.defaults.headers.put).not.toBe($http.defaults.headers.patch);
       });
+
+      it('should expose default param serializer at runtime', function() {
+        var paramSerializer = $http.defaults.paramSerializer;
+        expect(paramSerializer({foo: 'foo', bar: ['bar', 'baz']})).toEqual('bar=bar&bar=baz&foo=foo');
+      });
     });
   });
 
@@ -1860,3 +1974,93 @@ describe('$http with $applyAsync', function() {
     expect(log).toEqual(['response 1', 'response 2', 'response 3']);
   });
 });
+
+describe('$http without useLegacyPromiseExtensions', function() {
+  var $httpBackend, $http;
+  beforeEach(module(function($httpProvider) {
+    $httpProvider.useLegacyPromiseExtensions(false);
+  }, provideLog));
+
+  beforeEach(inject(['$httpBackend', '$http', '$rootScope', function($hb, $h, $rs) {
+    $httpBackend = $hb;
+    $http = $h;
+  }]));
+
+  it('should throw when the success or error methods are called if useLegacyPromiseExtensions is false', function() {
+    $httpBackend.expect('GET', '/url').respond('');
+    var promise = $http({url: '/url'});
+
+    function callSucess() {
+      promise.success();
+    }
+
+    function callError() {
+      promise.error();
+    }
+
+    expect(callSucess).toThrowMinErr(
+            '$http', 'legacy', 'The method `success` on the promise returned from `$http` has been disabled.');
+    expect(callError).toThrowMinErr(
+            '$http', 'legacy', 'The method `error` on the promise returned from `$http` has been disabled.');
+  });
+});
+
+describe('$http param serializers', function() {
+
+  var defSer, jqrSer;
+  beforeEach(inject(function($httpParamSerializer, $httpParamSerializerJQLike) {
+    defSer = $httpParamSerializer;
+    jqrSer = $httpParamSerializerJQLike;
+  }));
+
+  describe('common functionality', function() {
+
+    it('should return empty string for null or undefined params', function() {
+        expect(defSer(undefined)).toEqual('');
+        expect(jqrSer(undefined)).toEqual('');
+        expect(defSer(null)).toEqual('');
+        expect(jqrSer(null)).toEqual('');
+    });
+
+    it('should serialize objects', function() {
+      expect(defSer({foo: 'foov', bar: 'barv'})).toEqual('bar=barv&foo=foov');
+      expect(jqrSer({foo: 'foov', bar: 'barv'})).toEqual('bar=barv&foo=foov');
+      expect(defSer({someDate: new Date('2014-07-15T17:30:00.000Z')})).toEqual('someDate=2014-07-15T17:30:00.000Z');
+      expect(jqrSer({someDate: new Date('2014-07-15T17:30:00.000Z')})).toEqual('someDate=2014-07-15T17:30:00.000Z');
+    });
+
+  });
+
+  describe('default array serialization', function() {
+
+    it('should serialize arrays by repeating param name', function() {
+      expect(defSer({a: 'b', foo: ['bar', 'baz']})).toEqual('a=b&foo=bar&foo=baz');
+    });
+  });
+
+  describe('jquery array and objects serialization', function() {
+
+    it('should serialize arrays by repeating param name with [] suffix', function() {
+      expect(jqrSer({a: 'b', foo: ['bar', 'baz']})).toEqual('a=b&foo%5B%5D=bar&foo%5B%5D=baz');
+      expect(decodeURIComponent(jqrSer({a: 'b', foo: ['bar', 'baz']}))).toEqual('a=b&foo[]=bar&foo[]=baz');
+    });
+
+    it('should serialize objects by repeating param name with [key] suffix', function() {
+      expect(jqrSer({a: 'b', foo: {'bar': 'barv', 'baz': 'bazv'}})).toEqual('a=b&foo%5Bbar%5D=barv&foo%5Bbaz%5D=bazv');
+                                                                           //a=b&foo[bar]=barv&foo[baz]=bazv
+    });
+
+    it('should serialize nested objects by repeating param name with [key] suffix', function() {
+      expect(jqrSer({a: ['b', {c: 'd'}], e: {f: 'g', 'h': ['i', 'j']}})).toEqual(
+         'a%5B%5D=b&a%5B1%5D%5Bc%5D=d&e%5Bf%5D=g&e%5Bh%5D%5B%5D=i&e%5Bh%5D%5B%5D=j');
+         //a[]=b&a[1][c]=d&e[f]=g&e[h][]=i&e[h][]=j
+    });
+
+    it('should serialize objects inside array elements using their index', function() {
+      expect(jqrSer({a: ['b', 'c'], d: [{e: 'f', g: 'h'}, 'i', {j: 'k'}]})).toEqual(
+         'a%5B%5D=b&a%5B%5D=c&d%5B0%5D%5Be%5D=f&d%5B0%5D%5Bg%5D=h&d%5B%5D=i&d%5B2%5D%5Bj%5D=k');
+         //a[]=b&a[]=c&d[0][e]=f&d[0][g]=h&d[]=i&d[2][j]=k
+    });
+  });
+
+});
diff --git a/test/ng/interpolateSpec.js b/test/ng/interpolateSpec.js
index 232244ede492..dfab860b1e3b 100644
--- a/test/ng/interpolateSpec.js
+++ b/test/ng/interpolateSpec.js
@@ -125,6 +125,28 @@ describe('$interpolate', function() {
 
       expect($rootScope.$countWatchers()).toBe(0);
     }));
+
+    it('should stop watching strings with no expressions after first execution',
+      inject(function($interpolate, $rootScope) {
+        var spy = jasmine.createSpy();
+        $rootScope.$watch($interpolate('foo'), spy);
+        $rootScope.$digest();
+        expect($rootScope.$countWatchers()).toBe(0);
+        expect(spy).toHaveBeenCalledWith('foo', 'foo', $rootScope);
+        expect(spy.calls.length).toBe(1);
+      })
+    );
+
+    it('should stop watching strings with only constant expressions after first execution',
+      inject(function($interpolate, $rootScope) {
+        var spy = jasmine.createSpy();
+        $rootScope.$watch($interpolate('foo {{42}}'), spy);
+        $rootScope.$digest();
+        expect($rootScope.$countWatchers()).toBe(0);
+        expect(spy).toHaveBeenCalledWith('foo 42', 'foo 42', $rootScope);
+        expect(spy.calls.length).toBe(1);
+      })
+    );
   });
 
   describe('interpolation escaping', function() {
diff --git a/test/ng/intervalSpec.js b/test/ng/intervalSpec.js
index 41cddded3307..2bc2de321a18 100644
--- a/test/ng/intervalSpec.js
+++ b/test/ng/intervalSpec.js
@@ -142,6 +142,31 @@ describe('$interval', function() {
   }));
 
 
+  it('should allow you to specify a number of arguments', inject(function($interval, $window) {
+    var task1 = jasmine.createSpy('task1'),
+        task2 = jasmine.createSpy('task2'),
+        task3 = jasmine.createSpy('task3');
+    $interval(task1, 1000, 2, true, 'Task1');
+    $interval(task2, 1000, 2, true, 'Task2');
+    $interval(task3, 1000, 2, true, 'I', 'am', 'a', 'Task3', 'spy');
+
+    $window.flush(1000);
+    expect(task1).toHaveBeenCalledWith('Task1');
+    expect(task2).toHaveBeenCalledWith('Task2');
+    expect(task3).toHaveBeenCalledWith('I', 'am', 'a', 'Task3', 'spy');
+
+    task1.reset();
+    task2.reset();
+    task3.reset();
+
+    $window.flush(1000);
+    expect(task1).toHaveBeenCalledWith('Task1');
+    expect(task2).toHaveBeenCalledWith('Task2');
+    expect(task3).toHaveBeenCalledWith('I', 'am', 'a', 'Task3', 'spy');
+
+  }));
+
+
   it('should return a promise which will be updated with the count on each iteration',
       inject(function($interval, $window) {
     var log = [],
diff --git a/test/ng/localeSpec.js b/test/ng/localeSpec.js
index 1da9cf611062..a811de51fbad 100644
--- a/test/ng/localeSpec.js
+++ b/test/ng/localeSpec.js
@@ -3,7 +3,10 @@
 describe('$locale', function() {
   /* global $LocaleProvider: false */
 
-  var $locale = new $LocaleProvider().$get();
+  var $locale;
+  beforeEach(inject(function(_$locale_) {
+    $locale = _$locale_;
+  }));
 
   it('should have locale id set to en-us', function() {
     expect($locale.id).toBe('en-us');
diff --git a/test/ng/locationSpec.js b/test/ng/locationSpec.js
index de0561d0c16f..1efe3396762f 100644
--- a/test/ng/locationSpec.js
+++ b/test/ng/locationSpec.js
@@ -2,8 +2,8 @@
 'use strict';
 
 describe('$location', function() {
-  var url;
 
+  // Mock out the $log function - see testabilityPatch.js
   beforeEach(module(provideLog));
 
   afterEach(function() {
@@ -46,325 +46,303 @@ describe('$location', function() {
 
     it('should not include the drive name in path() on WIN', function() {
       //See issue #4680 for details
-      url = new LocationHashbangUrl('file:///base', '#!');
-      url.$$parse('file:///base#!/foo?a=b&c#hash');
+      var locationUrl = new LocationHashbangUrl('file:///base', 'file:///', '#!');
+      locationUrl.$$parse('file:///base#!/foo?a=b&c#hash');
 
-      expect(url.path()).toBe('/foo');
+      expect(locationUrl.path()).toBe('/foo');
     });
 
 
     it('should include the drive name if it was provided in the input url', function() {
-      url = new LocationHashbangUrl('file:///base', '#!');
-      url.$$parse('file:///base#!/C:/foo?a=b&c#hash');
+      var locationUrl = new LocationHashbangUrl('file:///base', 'file:///', '#!');
+      locationUrl.$$parse('file:///base#!/C:/foo?a=b&c#hash');
 
-      expect(url.path()).toBe('/C:/foo');
+      expect(locationUrl.path()).toBe('/C:/foo');
     });
   });
 
 
-  it('should not infinitely digest when using a semicolon in initial path', function() {
-    module(function($windowProvider, $locationProvider, $browserProvider, $documentProvider) {
-      $locationProvider.html5Mode(true);
-      $windowProvider.$get = function() {
-        var win = {};
-        angular.extend(win, window);
-        win.addEventListener = angular.noop;
-        win.removeEventListener = angular.noop;
-        win.history = {
-          replaceState: angular.noop,
-          pushState: angular.noop
-        };
-        win.location = {
-          href: 'http://localhost:9876/;jsessionid=foo',
-          replace: function(val) {
-            win.location.href = val;
-          }
-        };
-        return win;
-      };
-      var baseElement = jqLite('<base href="/">');
-      $documentProvider.$get = function() {
-        return {
-          0: window.document,
-          find: jasmine.createSpy('find').andReturn(baseElement)
-        };
-      };
-      $browserProvider.$get = function($document, $window) {
-        var sniffer = {history: true};
-        var logs = {log:[], warn:[], info:[], error:[]};
-        var fakeLog = {log: function() { logs.log.push(slice.call(arguments)); },
-                   warn: function() { logs.warn.push(slice.call(arguments)); },
-                   info: function() { logs.info.push(slice.call(arguments)); },
-                   error: function() { logs.error.push(slice.call(arguments)); }};
-
-        /* global Browser: false */
-        var b = new Browser($window, $document, fakeLog, sniffer);
-        b.pollFns = [];
-        return b;
-      };
-    });
-    var self = this;
-    inject(function($location, $browser, $rootScope) {
-      expect(function() {
-        $rootScope.$digest();
-      }).not.toThrow();
-    });
-  });
-
   describe('NewUrl', function() {
-    beforeEach(function() {
-      url = new LocationHtml5Url('http://www.domain.com:9877/');
-      url.$$parse('http://www.domain.com:9877/path/b?search=a&b=c&d#hash');
-    });
-
+    function createLocationHtml5Url() {
+      var locationUrl = new LocationHtml5Url('http://www.domain.com:9877/', 'http://www.domain.com:9877/');
+      locationUrl.$$parse('http://www.domain.com:9877/path/b?search=a&b=c&d#hash');
+      return locationUrl;
+    }
 
     it('should provide common getters', function() {
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#hash');
-      expect(url.protocol()).toBe('http');
-      expect(url.host()).toBe('www.domain.com');
-      expect(url.port()).toBe(9877);
-      expect(url.path()).toBe('/path/b');
-      expect(url.search()).toEqual({search: 'a', b: 'c', d: true});
-      expect(url.hash()).toBe('hash');
-      expect(url.url()).toBe('/path/b?search=a&b=c&d#hash');
+      var locationUrl = createLocationHtml5Url();
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#hash');
+      expect(locationUrl.protocol()).toBe('http');
+      expect(locationUrl.host()).toBe('www.domain.com');
+      expect(locationUrl.port()).toBe(9877);
+      expect(locationUrl.path()).toBe('/path/b');
+      expect(locationUrl.search()).toEqual({search: 'a', b: 'c', d: true});
+      expect(locationUrl.hash()).toBe('hash');
+      expect(locationUrl.url()).toBe('/path/b?search=a&b=c&d#hash');
     });
 
 
     it('path() should change path', function() {
-      url.path('/new/path');
-      expect(url.path()).toBe('/new/path');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/new/path?search=a&b=c&d#hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.path('/new/path');
+      expect(locationUrl.path()).toBe('/new/path');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/new/path?search=a&b=c&d#hash');
     });
 
     it('path() should not break on numeric values', function() {
-      url.path(1);
-      expect(url.path()).toBe('/1');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/1?search=a&b=c&d#hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.path(1);
+      expect(locationUrl.path()).toBe('/1');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/1?search=a&b=c&d#hash');
     });
 
     it('path() should allow using 0 as path', function() {
-      url.path(0);
-      expect(url.path()).toBe('/0');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/0?search=a&b=c&d#hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.path(0);
+      expect(locationUrl.path()).toBe('/0');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/0?search=a&b=c&d#hash');
     });
 
     it('path() should set to empty path on null value', function() {
-      url.path('/foo');
-      expect(url.path()).toBe('/foo');
-      url.path(null);
-      expect(url.path()).toBe('/');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.path('/foo');
+      expect(locationUrl.path()).toBe('/foo');
+      locationUrl.path(null);
+      expect(locationUrl.path()).toBe('/');
     });
 
     it('search() should accept string', function() {
-      url.search('x=y&c');
-      expect(url.search()).toEqual({x: 'y', c: true});
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?x=y&c#hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.search('x=y&c');
+      expect(locationUrl.search()).toEqual({x: 'y', c: true});
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?x=y&c#hash');
     });
 
 
     it('search() should accept object', function() {
-      url.search({one: 1, two: true});
-      expect(url.search()).toEqual({one: 1, two: true});
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?one=1&two#hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.search({one: 1, two: true});
+      expect(locationUrl.search()).toEqual({one: 1, two: true});
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?one=1&two#hash');
     });
 
 
     it('search() should copy object', function() {
+      var locationUrl = createLocationHtml5Url();
       var obj = {one: 1, two: true, three: null};
-      url.search(obj);
+      locationUrl.search(obj);
       expect(obj).toEqual({one: 1, two: true, three: null});
       obj.one = 'changed';
-      expect(url.search()).toEqual({one: 1, two: true});
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?one=1&two#hash');
+      expect(locationUrl.search()).toEqual({one: 1, two: true});
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?one=1&two#hash');
     });
 
 
     it('search() should change single parameter', function() {
-      url.search({id: 'old', preserved: true});
-      url.search('id', 'new');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.search({id: 'old', preserved: true});
+      locationUrl.search('id', 'new');
 
-      expect(url.search()).toEqual({id: 'new', preserved: true});
+      expect(locationUrl.search()).toEqual({id: 'new', preserved: true});
     });
 
 
     it('search() should remove single parameter', function() {
-      url.search({id: 'old', preserved: true});
-      url.search('id', null);
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.search({id: 'old', preserved: true});
+      locationUrl.search('id', null);
 
-      expect(url.search()).toEqual({preserved: true});
+      expect(locationUrl.search()).toEqual({preserved: true});
     });
 
 
     it('search() should remove multiple parameters', function() {
-      url.search({one: 1, two: true});
-      expect(url.search()).toEqual({one: 1, two: true});
-      url.search({one: null, two: null});
-      expect(url.search()).toEqual({});
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b#hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.search({one: 1, two: true});
+      expect(locationUrl.search()).toEqual({one: 1, two: true});
+      locationUrl.search({one: null, two: null});
+      expect(locationUrl.search()).toEqual({});
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b#hash');
     });
 
 
     it('search() should accept numeric keys', function() {
-      url.search({1: 'one', 2: 'two'});
-      expect(url.search()).toEqual({'1': 'one', '2': 'two'});
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?1=one&2=two#hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.search({1: 'one', 2: 'two'});
+      expect(locationUrl.search()).toEqual({'1': 'one', '2': 'two'});
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?1=one&2=two#hash');
     });
 
 
     it('search() should handle multiple value', function() {
-      url.search('a&b');
-      expect(url.search()).toEqual({a: true, b: true});
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.search('a&b');
+      expect(locationUrl.search()).toEqual({a: true, b: true});
 
-      url.search('a', null);
+      locationUrl.search('a', null);
 
-      expect(url.search()).toEqual({b: true});
+      expect(locationUrl.search()).toEqual({b: true});
 
-      url.search('b', undefined);
-      expect(url.search()).toEqual({});
+      locationUrl.search('b', undefined);
+      expect(locationUrl.search()).toEqual({});
     });
 
 
     it('search() should handle single value', function() {
-      url.search('ignore');
-      expect(url.search()).toEqual({ignore: true});
-      url.search(1);
-      expect(url.search()).toEqual({1: true});
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.search('ignore');
+      expect(locationUrl.search()).toEqual({ignore: true});
+      locationUrl.search(1);
+      expect(locationUrl.search()).toEqual({1: true});
     });
 
 
     it('search() should throw error an incorrect argument', function() {
+      var locationUrl = createLocationHtml5Url();
       expect(function() {
-        url.search(null);
+        locationUrl.search(null);
       }).toThrowMinErr('$location', 'isrcharg', 'The first argument of the `$location#search()` call must be a string or an object.');
       expect(function() {
-        url.search(undefined);
+        locationUrl.search(undefined);
       }).toThrowMinErr('$location', 'isrcharg', 'The first argument of the `$location#search()` call must be a string or an object.');
     });
 
 
     it('hash() should change hash fragment', function() {
-      url.hash('new-hash');
-      expect(url.hash()).toBe('new-hash');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#new-hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.hash('new-hash');
+      expect(locationUrl.hash()).toBe('new-hash');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#new-hash');
     });
 
 
     it('hash() should accept numeric parameter', function() {
-      url.hash(5);
-      expect(url.hash()).toBe('5');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#5');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.hash(5);
+      expect(locationUrl.hash()).toBe('5');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#5');
     });
 
     it('hash() should allow using 0', function() {
-      url.hash(0);
-      expect(url.hash()).toBe('0');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#0');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.hash(0);
+      expect(locationUrl.hash()).toBe('0');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#0');
     });
 
     it('hash() should accept null parameter', function() {
-      url.hash(null);
-      expect(url.hash()).toBe('');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.hash(null);
+      expect(locationUrl.hash()).toBe('');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d');
     });
 
 
     it('url() should change the path, search and hash', function() {
-      url.url('/some/path?a=b&c=d#hhh');
-      expect(url.url()).toBe('/some/path?a=b&c=d#hhh');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/some/path?a=b&c=d#hhh');
-      expect(url.path()).toBe('/some/path');
-      expect(url.search()).toEqual({a: 'b', c: 'd'});
-      expect(url.hash()).toBe('hhh');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.url('/some/path?a=b&c=d#hhh');
+      expect(locationUrl.url()).toBe('/some/path?a=b&c=d#hhh');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/some/path?a=b&c=d#hhh');
+      expect(locationUrl.path()).toBe('/some/path');
+      expect(locationUrl.search()).toEqual({a: 'b', c: 'd'});
+      expect(locationUrl.hash()).toBe('hhh');
     });
 
 
     it('url() should change only hash when no search and path specified', function() {
-      url.url('#some-hash');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.url('#some-hash');
 
-      expect(url.hash()).toBe('some-hash');
-      expect(url.url()).toBe('/path/b?search=a&b=c&d#some-hash');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#some-hash');
+      expect(locationUrl.hash()).toBe('some-hash');
+      expect(locationUrl.url()).toBe('/path/b?search=a&b=c&d#some-hash');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/path/b?search=a&b=c&d#some-hash');
     });
 
 
     it('url() should change only search and hash when no path specified', function() {
-      url.url('?a=b');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.url('?a=b');
 
-      expect(url.search()).toEqual({a: 'b'});
-      expect(url.hash()).toBe('');
-      expect(url.path()).toBe('/path/b');
+      expect(locationUrl.search()).toEqual({a: 'b'});
+      expect(locationUrl.hash()).toBe('');
+      expect(locationUrl.path()).toBe('/path/b');
     });
 
 
     it('url() should reset search and hash when only path specified', function() {
-      url.url('/new/path');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.url('/new/path');
 
-      expect(url.path()).toBe('/new/path');
-      expect(url.search()).toEqual({});
-      expect(url.hash()).toBe('');
+      expect(locationUrl.path()).toBe('/new/path');
+      expect(locationUrl.search()).toEqual({});
+      expect(locationUrl.hash()).toBe('');
     });
 
     it('url() should change path when empty string specified', function() {
-      url.url('');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.url('');
 
-      expect(url.path()).toBe('/');
-      expect(url.search()).toEqual({});
-      expect(url.hash()).toBe('');
+      expect(locationUrl.path()).toBe('/');
+      expect(locationUrl.search()).toEqual({});
+      expect(locationUrl.hash()).toBe('');
     });
 
 
     it('replace should set $$replace flag and return itself', function() {
-      expect(url.$$replace).toBe(false);
+      var locationUrl = createLocationHtml5Url();
+      expect(locationUrl.$$replace).toBe(false);
 
-      url.replace();
-      expect(url.$$replace).toBe(true);
-      expect(url.replace()).toBe(url);
+      locationUrl.replace();
+      expect(locationUrl.$$replace).toBe(true);
+      expect(locationUrl.replace()).toBe(locationUrl);
     });
 
 
     it('should parse new url', function() {
-      url = new LocationHtml5Url('http://host.com/');
-      url.$$parse('http://host.com/base');
-      expect(url.path()).toBe('/base');
+      var locationUrl = new LocationHtml5Url('http://host.com/', 'http://host.com/');
+      locationUrl.$$parse('http://host.com/base');
+      expect(locationUrl.path()).toBe('/base');
 
-      url = new LocationHtml5Url('http://host.com/');
-      url.$$parse('http://host.com/base#');
-      expect(url.path()).toBe('/base');
+      locationUrl = new LocationHtml5Url('http://host.com/', 'http://host.com/');
+      locationUrl.$$parse('http://host.com/base#');
+      expect(locationUrl.path()).toBe('/base');
     });
 
 
     it('should prefix path with forward-slash', function() {
-      url = new LocationHtml5Url('http://server/');
-      url.path('b');
+      var locationUrl = new LocationHtml5Url('http://server/', 'http://server/') ;
+      locationUrl.path('b');
 
-      expect(url.path()).toBe('/b');
-      expect(url.absUrl()).toBe('http://server/b');
+      expect(locationUrl.path()).toBe('/b');
+      expect(locationUrl.absUrl()).toBe('http://server/b');
     });
 
 
     it('should set path to forward-slash when empty', function() {
-      url = new LocationHtml5Url('http://server/');
-      url.$$parse('http://server/');
-      expect(url.path()).toBe('/');
-      expect(url.absUrl()).toBe('http://server/');
+      var locationUrl = new LocationHtml5Url('http://server/', 'http://server/') ;
+      locationUrl.$$parse('http://server/');
+      expect(locationUrl.path()).toBe('/');
+      expect(locationUrl.absUrl()).toBe('http://server/');
     });
 
 
     it('setters should return Url object to allow chaining', function() {
-      expect(url.path('/any')).toBe(url);
-      expect(url.search('')).toBe(url);
-      expect(url.hash('aaa')).toBe(url);
-      expect(url.url('/some')).toBe(url);
+      var locationUrl = createLocationHtml5Url();
+      expect(locationUrl.path('/any')).toBe(locationUrl);
+      expect(locationUrl.search('')).toBe(locationUrl);
+      expect(locationUrl.hash('aaa')).toBe(locationUrl);
+      expect(locationUrl.url('/some')).toBe(locationUrl);
     });
 
 
     it('should not preserve old properties when parsing new url', function() {
-      url.$$parse('http://www.domain.com:9877/a');
+      var locationUrl = createLocationHtml5Url();
+      locationUrl.$$parse('http://www.domain.com:9877/a');
 
-      expect(url.path()).toBe('/a');
-      expect(url.search()).toEqual({});
-      expect(url.hash()).toBe('');
-      expect(url.absUrl()).toBe('http://www.domain.com:9877/a');
+      expect(locationUrl.path()).toBe('/a');
+      expect(locationUrl.search()).toEqual({});
+      expect(locationUrl.hash()).toBe('');
+      expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/a');
     });
 
     it('should not rewrite when hashbang url is not given', function() {
@@ -378,60 +356,64 @@ describe('$location', function() {
     });
 
     it('should prepend path with basePath', function() {
-      url = new LocationHtml5Url('http://server/base/');
-      url.$$parse('http://server/base/abc?a');
-      expect(url.path()).toBe('/abc');
-      expect(url.search()).toEqual({a: true});
+      var locationUrl = new LocationHtml5Url('http://server/base/', 'http://server/base/') ;
+      locationUrl.$$parse('http://server/base/abc?a');
+      expect(locationUrl.path()).toBe('/abc');
+      expect(locationUrl.search()).toEqual({a: true});
 
-      url.path('/new/path');
-      expect(url.absUrl()).toBe('http://server/base/new/path?a');
+      locationUrl.path('/new/path');
+      expect(locationUrl.absUrl()).toBe('http://server/base/new/path?a');
     });
 
 
     it('should throw error when invalid server url given', function() {
-      url = new LocationHtml5Url('http://server.org/base/abc', '/base');
+      var locationUrl = new LocationHtml5Url('http://server.org/base/abc', 'http://server.org/base/', '/base');
 
       expect(function() {
-        url.$$parse('http://other.server.org/path#/path');
+        locationUrl.$$parse('http://other.server.org/path#/path');
       }).toThrowMinErr('$location', 'ipthprfx', 'Invalid url "http://other.server.org/path#/path", missing path prefix "http://server.org/base/".');
     });
 
 
     it('should throw error when invalid base url given', function() {
-      url = new LocationHtml5Url('http://server.org/base/abc', '/base');
+      var locationUrl = new LocationHtml5Url('http://server.org/base/abc', 'http://server.org/base/', '/base');
 
       expect(function() {
-        url.$$parse('http://server.org/path#/path');
+        locationUrl.$$parse('http://server.org/path#/path');
       }).toThrowMinErr('$location', 'ipthprfx', 'Invalid url "http://server.org/path#/path", missing path prefix "http://server.org/base/".');
     });
 
 
     describe('state', function() {
       it('should set $$state and return itself', function() {
-        expect(url.$$state).toEqual(null);
+        var locationUrl = createLocationHtml5Url();
+        expect(locationUrl.$$state).toEqual(null);
 
-        var returned = url.state({a: 2});
-        expect(url.$$state).toEqual({a: 2});
-        expect(returned).toBe(url);
+        var returned = locationUrl.state({a: 2});
+        expect(locationUrl.$$state).toEqual({a: 2});
+        expect(returned).toBe(locationUrl);
       });
 
       it('should set state', function() {
-        url.state({a: 2});
-        expect(url.state()).toEqual({a: 2});
+        var locationUrl = createLocationHtml5Url();
+        locationUrl.state({a: 2});
+        expect(locationUrl.state()).toEqual({a: 2});
       });
 
       it('should allow to set both URL and state', function() {
-        url.url('/foo').state({a: 2});
-        expect(url.url()).toEqual('/foo');
-        expect(url.state()).toEqual({a: 2});
+        var locationUrl = createLocationHtml5Url();
+        locationUrl.url('/foo').state({a: 2});
+        expect(locationUrl.url()).toEqual('/foo');
+        expect(locationUrl.state()).toEqual({a: 2});
       });
 
       it('should allow to mix state and various URL functions', function() {
-        url.path('/foo').hash('abcd').state({a: 2}).search('bar', 'baz');
-        expect(url.path()).toEqual('/foo');
-        expect(url.state()).toEqual({a: 2});
-        expect(url.search() && url.search().bar).toBe('baz');
-        expect(url.hash()).toEqual('abcd');
+        var locationUrl = createLocationHtml5Url();
+        locationUrl.path('/foo').hash('abcd').state({a: 2}).search('bar', 'baz');
+        expect(locationUrl.path()).toEqual('/foo');
+        expect(locationUrl.state()).toEqual({a: 2});
+        expect(locationUrl.search() && locationUrl.search().bar).toBe('baz');
+        expect(locationUrl.hash()).toEqual('abcd');
       });
     });
 
@@ -439,43 +421,46 @@ describe('$location', function() {
     describe('encoding', function() {
 
       it('should encode special characters', function() {
-        url.path('/a <>#');
-        url.search({'i j': '<>#'});
-        url.hash('<>#');
-
-        expect(url.path()).toBe('/a <>#');
-        expect(url.search()).toEqual({'i j': '<>#'});
-        expect(url.hash()).toBe('<>#');
-        expect(url.absUrl()).toBe('http://www.domain.com:9877/a%20%3C%3E%23?i%20j=%3C%3E%23#%3C%3E%23');
+        var locationUrl = createLocationHtml5Url();
+        locationUrl.path('/a <>#');
+        locationUrl.search({'i j': '<>#'});
+        locationUrl.hash('<>#');
+
+        expect(locationUrl.path()).toBe('/a <>#');
+        expect(locationUrl.search()).toEqual({'i j': '<>#'});
+        expect(locationUrl.hash()).toBe('<>#');
+        expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/a%20%3C%3E%23?i%20j=%3C%3E%23#%3C%3E%23');
       });
 
 
       it('should not encode !$:@', function() {
-        url.path('/!$:@');
-        url.search('');
-        url.hash('!$:@');
+        var locationUrl = createLocationHtml5Url();
+        locationUrl.path('/!$:@');
+        locationUrl.search('');
+        locationUrl.hash('!$:@');
 
-        expect(url.absUrl()).toBe('http://www.domain.com:9877/!$:@#!$:@');
+        expect(locationUrl.absUrl()).toBe('http://www.domain.com:9877/!$:@#!$:@');
       });
 
 
       it('should decode special characters', function() {
-        url = new LocationHtml5Url('http://host.com/');
-        url.$$parse('http://host.com/a%20%3C%3E%23?i%20j=%3C%3E%23#x%20%3C%3E%23');
-        expect(url.path()).toBe('/a <>#');
-        expect(url.search()).toEqual({'i j': '<>#'});
-        expect(url.hash()).toBe('x <>#');
+        var locationUrl = new LocationHtml5Url('http://host.com/', 'http://host.com/');
+        locationUrl.$$parse('http://host.com/a%20%3C%3E%23?i%20j=%3C%3E%23#x%20%3C%3E%23');
+        expect(locationUrl.path()).toBe('/a <>#');
+        expect(locationUrl.search()).toEqual({'i j': '<>#'});
+        expect(locationUrl.hash()).toBe('x <>#');
       });
 
       it('should decode pluses as spaces in urls', function() {
-        url = new LocationHtml5Url('http://host.com/');
-        url.$$parse('http://host.com/?a+b=c+d');
-        expect(url.search()).toEqual({'a b':'c d'});
+        var locationUrl = new LocationHtml5Url('http://host.com/', 'http://host.com/');
+        locationUrl.$$parse('http://host.com/?a+b=c+d');
+        expect(locationUrl.search()).toEqual({'a b':'c d'});
       });
 
       it('should retain pluses when setting search queries', function() {
-        url.search({'a+b':'c+d'});
-        expect(url.search()).toEqual({'a+b':'c+d'});
+        var locationUrl = createLocationHtml5Url();
+        locationUrl.search({'a+b':'c+d'});
+        expect(locationUrl.search()).toEqual({'a+b':'c+d'});
       });
 
     });
@@ -484,159 +469,167 @@ describe('$location', function() {
 
   describe('HashbangUrl', function() {
 
-    beforeEach(function() {
-      url = new LocationHashbangUrl('http://www.server.org:1234/base', '#!');
-      url.$$parse('http://www.server.org:1234/base#!/path?a=b&c#hash');
-    });
+    function createHashbangUrl() {
+      var locationUrl = new LocationHashbangUrl('http://www.server.org:1234/base', 'http://www.server.org:1234/', '#!');
+      locationUrl.$$parse('http://www.server.org:1234/base#!/path?a=b&c#hash');
+      return locationUrl;
+    }
 
 
     it('should parse hashbang url into path and search', function() {
-      expect(url.protocol()).toBe('http');
-      expect(url.host()).toBe('www.server.org');
-      expect(url.port()).toBe(1234);
-      expect(url.path()).toBe('/path');
-      expect(url.search()).toEqual({a: 'b', c: true});
-      expect(url.hash()).toBe('hash');
+      var locationUrl = createHashbangUrl();
+      expect(locationUrl.protocol()).toBe('http');
+      expect(locationUrl.host()).toBe('www.server.org');
+      expect(locationUrl.port()).toBe(1234);
+      expect(locationUrl.path()).toBe('/path');
+      expect(locationUrl.search()).toEqual({a: 'b', c: true});
+      expect(locationUrl.hash()).toBe('hash');
     });
 
 
     it('absUrl() should return hashbang url', function() {
-      expect(url.absUrl()).toBe('http://www.server.org:1234/base#!/path?a=b&c#hash');
+      var locationUrl = createHashbangUrl();
+      expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base#!/path?a=b&c#hash');
 
-      url.path('/new/path');
-      url.search({one: 1});
-      url.hash('hhh');
-      expect(url.absUrl()).toBe('http://www.server.org:1234/base#!/new/path?one=1#hhh');
+      locationUrl.path('/new/path');
+      locationUrl.search({one: 1});
+      locationUrl.hash('hhh');
+      expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base#!/new/path?one=1#hhh');
     });
 
 
     it('should preserve query params in base', function() {
-      url = new LocationHashbangUrl('http://www.server.org:1234/base?base=param', '#');
-      url.$$parse('http://www.server.org:1234/base?base=param#/path?a=b&c#hash');
-      expect(url.absUrl()).toBe('http://www.server.org:1234/base?base=param#/path?a=b&c#hash');
+      var locationUrl = new LocationHashbangUrl('http://www.server.org:1234/base?base=param', 'http://www.server.org:1234/', '#');
+      locationUrl.$$parse('http://www.server.org:1234/base?base=param#/path?a=b&c#hash');
+      expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base?base=param#/path?a=b&c#hash');
 
-      url.path('/new/path');
-      url.search({one: 1});
-      url.hash('hhh');
-      expect(url.absUrl()).toBe('http://www.server.org:1234/base?base=param#/new/path?one=1#hhh');
+      locationUrl.path('/new/path');
+      locationUrl.search({one: 1});
+      locationUrl.hash('hhh');
+      expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base?base=param#/new/path?one=1#hhh');
     });
 
 
     it('should prefix path with forward-slash', function() {
-      url = new LocationHashbangUrl('http://host.com/base', '#');
-      url.$$parse('http://host.com/base#path');
-      expect(url.path()).toBe('/path');
-      expect(url.absUrl()).toBe('http://host.com/base#/path');
+      var locationUrl = new LocationHashbangUrl('http://host.com/base', 'http://host.com/', '#');
+      locationUrl.$$parse('http://host.com/base#path');
+      expect(locationUrl.path()).toBe('/path');
+      expect(locationUrl.absUrl()).toBe('http://host.com/base#/path');
 
-      url.path('wrong');
-      expect(url.path()).toBe('/wrong');
-      expect(url.absUrl()).toBe('http://host.com/base#/wrong');
+      locationUrl.path('wrong');
+      expect(locationUrl.path()).toBe('/wrong');
+      expect(locationUrl.absUrl()).toBe('http://host.com/base#/wrong');
     });
 
 
     it('should set path to forward-slash when empty', function() {
-      url = new LocationHashbangUrl('http://server/base', '#!');
-      url.$$parse('http://server/base');
-      url.path('aaa');
+      var locationUrl = new LocationHashbangUrl('http://server/base', 'http://server/', '#!');
+      locationUrl.$$parse('http://server/base');
+      locationUrl.path('aaa');
 
-      expect(url.path()).toBe('/aaa');
-      expect(url.absUrl()).toBe('http://server/base#!/aaa');
+      expect(locationUrl.path()).toBe('/aaa');
+      expect(locationUrl.absUrl()).toBe('http://server/base#!/aaa');
     });
 
 
     it('should not preserve old properties when parsing new url', function() {
-      url.$$parse('http://www.server.org:1234/base#!/');
+      var locationUrl = createHashbangUrl();
+      locationUrl.$$parse('http://www.server.org:1234/base#!/');
 
-      expect(url.path()).toBe('/');
-      expect(url.search()).toEqual({});
-      expect(url.hash()).toBe('');
-      expect(url.absUrl()).toBe('http://www.server.org:1234/base#!/');
+      expect(locationUrl.path()).toBe('/');
+      expect(locationUrl.search()).toEqual({});
+      expect(locationUrl.hash()).toBe('');
+      expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base#!/');
     });
 
 
     it('should insert default hashbang if a hash is given with no hashbang prefix', function() {
+      var locationUrl = createHashbangUrl();
 
-      url.$$parse('http://www.server.org:1234/base#/path');
-      expect(url.absUrl()).toBe('http://www.server.org:1234/base#!#%2Fpath');
-      expect(url.hash()).toBe('/path');
-      expect(url.path()).toBe('');
+      locationUrl.$$parse('http://www.server.org:1234/base#/path');
+      expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base#!#%2Fpath');
+      expect(locationUrl.hash()).toBe('/path');
+      expect(locationUrl.path()).toBe('');
 
-      url.$$parse('http://www.server.org:1234/base#');
-      expect(url.absUrl()).toBe('http://www.server.org:1234/base');
-      expect(url.hash()).toBe('');
-      expect(url.path()).toBe('');
+      locationUrl.$$parse('http://www.server.org:1234/base#');
+      expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base');
+      expect(locationUrl.hash()).toBe('');
+      expect(locationUrl.path()).toBe('');
     });
 
     it('should ignore extra path segments if no hashbang is given', function() {
-      url.$$parse('http://www.server.org:1234/base/extra/path');
-      expect(url.absUrl()).toBe('http://www.server.org:1234/base');
-      expect(url.path()).toBe('');
-      expect(url.hash()).toBe('');
+      var locationUrl = createHashbangUrl();
+      locationUrl.$$parse('http://www.server.org:1234/base/extra/path');
+      expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base');
+      expect(locationUrl.path()).toBe('');
+      expect(locationUrl.hash()).toBe('');
     });
 
 
     describe('encoding', function() {
 
       it('should encode special characters', function() {
-        url.path('/a <>#');
-        url.search({'i j': '<>#'});
-        url.hash('<>#');
-
-        expect(url.path()).toBe('/a <>#');
-        expect(url.search()).toEqual({'i j': '<>#'});
-        expect(url.hash()).toBe('<>#');
-        expect(url.absUrl()).toBe('http://www.server.org:1234/base#!/a%20%3C%3E%23?i%20j=%3C%3E%23#%3C%3E%23');
+        var locationUrl = createHashbangUrl();
+        locationUrl.path('/a <>#');
+        locationUrl.search({'i j': '<>#'});
+        locationUrl.hash('<>#');
+
+        expect(locationUrl.path()).toBe('/a <>#');
+        expect(locationUrl.search()).toEqual({'i j': '<>#'});
+        expect(locationUrl.hash()).toBe('<>#');
+        expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base#!/a%20%3C%3E%23?i%20j=%3C%3E%23#%3C%3E%23');
       });
 
 
       it('should not encode !$:@', function() {
-        url.path('/!$:@');
-        url.search('');
-        url.hash('!$:@');
+        var locationUrl = createHashbangUrl();
+        locationUrl.path('/!$:@');
+        locationUrl.search('');
+        locationUrl.hash('!$:@');
 
-        expect(url.absUrl()).toBe('http://www.server.org:1234/base#!/!$:@#!$:@');
+        expect(locationUrl.absUrl()).toBe('http://www.server.org:1234/base#!/!$:@#!$:@');
       });
 
 
       it('should decode special characters', function() {
-        url = new LocationHashbangUrl('http://host.com/a', '#');
-        url.$$parse('http://host.com/a#/%20%3C%3E%23?i%20j=%3C%3E%23#x%20%3C%3E%23');
-        expect(url.path()).toBe('/ <>#');
-        expect(url.search()).toEqual({'i j': '<>#'});
-        expect(url.hash()).toBe('x <>#');
+        var locationUrl = new LocationHashbangUrl('http://host.com/a', 'http://host.com/', '#');
+        locationUrl.$$parse('http://host.com/a#/%20%3C%3E%23?i%20j=%3C%3E%23#x%20%3C%3E%23');
+        expect(locationUrl.path()).toBe('/ <>#');
+        expect(locationUrl.search()).toEqual({'i j': '<>#'});
+        expect(locationUrl.hash()).toBe('x <>#');
       });
 
 
       it('should return decoded characters for search specified in URL', function() {
-        var locationUrl = new LocationHtml5Url('http://host.com/');
+        var locationUrl = new LocationHtml5Url('http://host.com/', 'http://host.com/');
         locationUrl.$$parse('http://host.com/?q=1%2F2%203');
         expect(locationUrl.search()).toEqual({'q': '1/2 3'});
       });
 
 
       it('should return decoded characters for search specified with setter', function() {
-        var locationUrl = new LocationHtml5Url('http://host.com/');
+        var locationUrl = new LocationHtml5Url('http://host.com/', 'http://host.com/');
         locationUrl.$$parse('http://host.com/');
         locationUrl.search('q', '1/2 3');
         expect(locationUrl.search()).toEqual({'q': '1/2 3'});
       });
 
       it('should return an array for duplicate params', function() {
-        var locationUrl = new LocationHtml5Url('http://host.com');
+        var locationUrl = new LocationHtml5Url('http://host.com', 'http://host.com') ;
         locationUrl.$$parse('http://host.com');
         locationUrl.search('q', ['1/2 3','4/5 6']);
         expect(locationUrl.search()).toEqual({'q': ['1/2 3','4/5 6']});
       });
 
       it('should encode an array correctly from search and add to url', function() {
-        var locationUrl = new LocationHtml5Url('http://host.com');
+        var locationUrl = new LocationHtml5Url('http://host.com', 'http://host.com') ;
         locationUrl.$$parse('http://host.com');
         locationUrl.search({'q': ['1/2 3','4/5 6']});
         expect(locationUrl.absUrl()).toEqual('http://host.com?q=1%2F2%203&q=4%2F5%206');
       });
 
       it('should rewrite params when specifing a single param in search', function() {
-        var locationUrl = new LocationHtml5Url('http://host.com');
+        var locationUrl = new LocationHtml5Url('http://host.com', 'http://host.com') ;
         locationUrl.$$parse('http://host.com');
         locationUrl.search({'q': '1/2 3'});
         expect(locationUrl.absUrl()).toEqual('http://host.com?q=1%2F2%203');
@@ -647,183 +640,390 @@ describe('$location', function() {
   });
 
 
-  function initService(options) {
-    return module(function($provide, $locationProvider) {
-      $locationProvider.html5Mode(options.html5Mode);
-      $locationProvider.hashPrefix(options.hashPrefix);
-      $provide.value('$sniffer', {history: options.supportHistory});
+  describe('location watch', function() {
+
+    it('should not update browser if only the empty hash fragment is cleared by updating the search', function() {
+      initService({supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#', baseHref:'/base/'});
+      inject(function($rootScope, $browser, $location) {
+        $browser.url('http://new.com/a/b');
+        var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+        $rootScope.$digest();
+        expect($browserUrl).not.toHaveBeenCalled();
+      });
     });
-  }
-  function initBrowser(options) {
-    return function($browser) {
-      $browser.url(options.url);
-      $browser.$$baseHref = options.basePath;
-    };
-  }
 
-  describe('location watch', function() {
-    beforeEach(initService({supportHistory: true}));
-    beforeEach(inject(initBrowser({url:'http://new.com/a/b#'})));
-
-    it('should not update browser if only the empty hash fragment is cleared by updating the search', inject(function($rootScope, $browser, $location) {
-      $browser.url('http://new.com/a/b#');
-      var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
-      $rootScope.$digest();
-      expect($browserUrl).not.toHaveBeenCalled();
-    }));
-  });
 
-  describe('rewrite hashbang url <> html5 url', function() {
-    beforeEach(initService({html5Mode: true, supportHistory: true}));
-    beforeEach(inject(initBrowser({url:'http://new.com/#', basePath: '/'})));
+    it('should not replace browser url if only the empty hash fragment is cleared', function() {
+      initService({html5Mode: true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/#', baseHref: '/'});
+      inject(function($browser, $location) {
+        expect($browser.url()).toBe('http://new.com/#');
+        expect($location.absUrl()).toBe('http://new.com/');
+      });
+    });
 
-    it('should not replace browser url if only the empty hash fragment is cleared', inject(function($browser, $location) {
-      expect($browser.url()).toBe('http://new.com/#');
-      expect($location.absUrl()).toBe('http://new.com/');
-    }));
-  });
 
-  describe('wiring', function() {
+    it('should not get caught in infinite digest when replacing path in locationChangeSuccess handler', function() {
+      initService({html5Mode:true,supportHistory:false});
+      mockUpBrowser({initialUrl:'http://server/base/home', baseHref:'/base/'});
+      inject(
+        function($browser, $location, $rootScope, $window) {
+          var handlerCalled = false;
+          $rootScope.$on('$locationChangeSuccess', function() {
+            handlerCalled = true;
+            if ($location.path() !== '/') {
+                $location.path('/').replace();
+            }
+          });
+          expect($browser.url()).toEqual('http://server/base/#/home');
+          $rootScope.$digest();
+          expect(handlerCalled).toEqual(true);
+          expect($browser.url()).toEqual('http://server/base/#/');
+        }
+      );
+    });
 
-    beforeEach(initService({html5Mode:false,hashPrefix: '!',supportHistory: true}));
-    beforeEach(inject(initBrowser({url:'http://new.com/a/b#!',basePath: 'http://new.com/a/b'})));
+    it('should not infinitely digest when using a semicolon in initial path', function() {
+      initService({html5Mode:true,supportHistory:true});
+      mockUpBrowser({initialUrl:'http://localhost:9876/;jsessionid=foo', baseHref:'/'});
+      inject(function($location, $browser, $rootScope) {
+        expect(function() {
+          $rootScope.$digest();
+        }).not.toThrow();
+      });
+    });
 
 
-    it('should update $location when browser url changes', inject(function($browser, $location) {
-      spyOn($location, '$$parse').andCallThrough();
-      $browser.url('http://new.com/a/b#!/aaa');
-      $browser.poll();
-      expect($location.absUrl()).toBe('http://new.com/a/b#!/aaa');
-      expect($location.path()).toBe('/aaa');
-      expect($location.$$parse).toHaveBeenCalledOnce();
-    }));
+    function updatePathOnLocationChangeSuccessTo(newPath) {
+      inject(function($rootScope, $location) {
+        $rootScope.$on('$locationChangeSuccess', function(event, newUrl, oldUrl) {
+          $location.path(newPath);
+        });
+      });
+    }
 
 
-    // location.href = '...' fires hashchange event synchronously, so it might happen inside $apply
-    it('should not $apply when browser url changed inside $apply', inject(
-        function($rootScope, $browser, $location) {
-      var OLD_URL = $browser.url(),
-          NEW_URL = 'http://new.com/a/b#!/new';
+    describe('location watch for hashbang browsers', function() {
+
+      it('should not infinite $digest when going to base URL without trailing slash when $locationChangeSuccess watcher changes path to /Home', function() {
+        initService({html5Mode: true, supportHistory: false});
+        mockUpBrowser({initialUrl:'http://server/app/', baseHref:'/app/'});
+        inject(function($rootScope, $location, $browser) {
+          var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+
+          updatePathOnLocationChangeSuccessTo('/Home');
 
+          $rootScope.$digest();
 
-      $rootScope.$apply(function() {
-        $browser.url(NEW_URL);
-        $browser.poll(); // simulate firing event from browser
-        expect($location.absUrl()).toBe(OLD_URL); // should be async
+          expect($browser.url()).toEqual('http://server/app/#/Home');
+          expect($location.path()).toEqual('/Home');
+          expect($browserUrl.calls.length).toEqual(1);
+        });
       });
 
-      expect($location.absUrl()).toBe(NEW_URL);
-    }));
+      it('should not infinite $digest when going to base URL without trailing slash when $locationChangeSuccess watcher changes path to /', function() {
+        initService({html5Mode: true, supportHistory: false});
+        mockUpBrowser({initialUrl:'http://server/app/Home', baseHref:'/app/'});
+        inject(function($rootScope, $location, $browser, $window) {
+          var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
 
-    // location.href = '...' fires hashchange event synchronously, so it might happen inside $digest
-    it('should not $apply when browser url changed inside $digest', inject(
-        function($rootScope, $browser, $location) {
-      var OLD_URL = $browser.url(),
-          NEW_URL = 'http://new.com/a/b#!/new',
-          notRunYet = true;
-
-      $rootScope.$watch(function() {
-        if (notRunYet) {
-          notRunYet = false;
-          $browser.url(NEW_URL);
-          $browser.poll(); // simulate firing event from browser
+          updatePathOnLocationChangeSuccessTo('/');
+
+          $rootScope.$digest();
+
+          expect($browser.url()).toEqual('http://server/app/#/');
+          expect($location.path()).toEqual('/');
+          expect($browserUrl.calls.length).toEqual(1);
+          expect($browserUrl.calls[0].args).toEqual(['http://server/app/#/', false, null]);
+        });
+      });
+
+      it('should not infinite $digest when going to base URL with trailing slash when $locationChangeSuccess watcher changes path to /Home', function() {
+        initService({html5Mode: true, supportHistory: false});
+        mockUpBrowser({initialUrl:'http://server/app/', baseHref:'/app/'});
+        inject(function($rootScope, $location, $browser) {
+          var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+
+          updatePathOnLocationChangeSuccessTo('/Home');
+          $rootScope.$digest();
+
+          expect($browser.url()).toEqual('http://server/app/#/Home');
+          expect($location.path()).toEqual('/Home');
+          expect($browserUrl.calls.length).toEqual(1);
+          expect($browserUrl.calls[0].args).toEqual(['http://server/app/#/Home', false, null]);
+        });
+      });
+
+      it('should not infinite $digest when going to base URL with trailing slash when $locationChangeSuccess watcher changes path to /', function() {
+        initService({html5Mode: true, supportHistory: false});
+        mockUpBrowser({initialUrl:'http://server/app/', baseHref:'/app/'});
+        inject(function($rootScope, $location, $browser) {
+          var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+
+          updatePathOnLocationChangeSuccessTo('/');
+          $rootScope.$digest();
+
+          expect($browser.url()).toEqual('http://server/app/#/');
+          expect($location.path()).toEqual('/');
+          expect($browserUrl.calls.length).toEqual(1);
+        });
+      });
+    });
+
+
+    describe('location watch for HTML5 browsers', function() {
+
+      it('should not infinite $digest when going to base URL without trailing slash when $locationChangeSuccess watcher changes path to /Home', function() {
+        initService({html5Mode: true, supportHistory: true});
+        mockUpBrowser({initialUrl:'http://server/app/', baseHref:'/app/'});
+        inject(function($rootScope, $injector, $browser) {
+          var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+
+          var $location = $injector.get('$location');
+          updatePathOnLocationChangeSuccessTo('/Home');
+
+          $rootScope.$digest();
+
+          expect($browser.url()).toEqual('http://server/app/Home');
+          expect($location.path()).toEqual('/Home');
+          expect($browserUrl.calls.length).toEqual(1);
+        });
+      });
+
+      it('should not infinite $digest when going to base URL without trailing slash when $locationChangeSuccess watcher changes path to /', function() {
+        initService({html5Mode: true, supportHistory: true});
+        mockUpBrowser({initialUrl:'http://server/app/', baseHref:'/app/'});
+        inject(function($rootScope, $injector, $browser) {
+          var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+
+          var $location = $injector.get('$location');
+          updatePathOnLocationChangeSuccessTo('/');
+
+          $rootScope.$digest();
+
+          expect($browser.url()).toEqual('http://server/app/');
+          expect($location.path()).toEqual('/');
+          expect($browserUrl.calls.length).toEqual(0);
+        });
+      });
+
+      it('should not infinite $digest when going to base URL with trailing slash when $locationChangeSuccess watcher changes path to /Home', function() {
+        initService({html5Mode: true, supportHistory: true});
+        mockUpBrowser({initialUrl:'http://server/app/', baseHref:'/app/'});
+        inject(function($rootScope, $injector, $browser) {
+          var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+
+          var $location = $injector.get('$location');
+          updatePathOnLocationChangeSuccessTo('/Home');
+
+          $rootScope.$digest();
+
+          expect($browser.url()).toEqual('http://server/app/Home');
+          expect($location.path()).toEqual('/Home');
+          expect($browserUrl.calls.length).toEqual(1);
+        });
+      });
+
+      it('should not infinite $digest when going to base URL with trailing slash when $locationChangeSuccess watcher changes path to /', function() {
+        initService({html5Mode: true, supportHistory: true});
+        mockUpBrowser({initialUrl:'http://server/app/', baseHref:'/app/'});
+        inject(function($rootScope, $injector, $browser) {
+          var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+
+          var $location = $injector.get('$location');
+          updatePathOnLocationChangeSuccessTo('/');
+
+          $rootScope.$digest();
+
+          expect($browser.url()).toEqual('http://server/app/');
+          expect($location.path()).toEqual('/');
+          expect($browserUrl.calls.length).toEqual(0);
+        });
+      });
+    });
+
+  });
+
+  describe('wiring', function() {
+
+    it('should update $location when browser url changes', function() {
+      initService({html5Mode:false,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#!', baseHref:'/a/b'});
+      inject(function($window, $browser, $location, $rootScope) {
+        spyOn($location, '$$parse').andCallThrough();
+        $window.location.href = 'http://new.com/a/b#!/aaa';
+        $browser.$$checkUrlChange();
+        expect($location.absUrl()).toBe('http://new.com/a/b#!/aaa');
+        expect($location.path()).toBe('/aaa');
+        expect($location.$$parse).toHaveBeenCalledOnce();
+      });
+    });
+
+    // location.href = '...' fires hashchange event synchronously, so it might happen inside $apply
+    it('should not $apply when browser url changed inside $apply', function() {
+      initService({html5Mode:false,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#!', baseHref:'/a/b'});
+      inject(function($rootScope, $browser, $location, $window) {
+        var OLD_URL = $browser.url(),
+            NEW_URL = 'http://new.com/a/b#!/new';
+
+        $rootScope.$apply(function() {
+          $window.location.href= NEW_URL;
+          $browser.$$checkUrlChange(); // simulate firing event from browser
           expect($location.absUrl()).toBe(OLD_URL); // should be async
-        }
+        });
+
+        expect($location.absUrl()).toBe(NEW_URL);
       });
+    });
 
-      $rootScope.$digest();
-      expect($location.absUrl()).toBe(NEW_URL);
-    }));
+    // location.href = '...' fires hashchange event synchronously, so it might happen inside $digest
+    it('should not $apply when browser url changed inside $digest', function() {
+      initService({html5Mode:false,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#!', baseHref:'/a/b'});
+      inject(function($rootScope, $browser, $location, $window) {
+        var OLD_URL = $browser.url(),
+            NEW_URL = 'http://new.com/a/b#!/new',
+            notRunYet = true;
+
+        $rootScope.$watch(function() {
+          if (notRunYet) {
+            notRunYet = false;
+            $window.location.href = NEW_URL;
+            $browser.$$checkUrlChange(); // simulate firing event from browser
+            expect($location.absUrl()).toBe(OLD_URL); // should be async
+          }
+        });
 
+        $rootScope.$digest();
+        expect($location.absUrl()).toBe(NEW_URL);
+      });
+    });
 
-    it('should update browser when $location changes', inject(function($rootScope, $browser, $location) {
-      var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
-      $location.path('/new/path');
-      expect($browserUrl).not.toHaveBeenCalled();
-      $rootScope.$apply();
 
-      expect($browserUrl).toHaveBeenCalledOnce();
-      expect($browser.url()).toBe('http://new.com/a/b#!/new/path');
-    }));
+    it('should update browser when $location changes', function() {
+      initService({html5Mode:false,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#!', baseHref:'/a/b'});
+      inject(function($rootScope, $browser, $location) {
+        var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+        $location.path('/new/path');
+        expect($browserUrl).not.toHaveBeenCalled();
+        $rootScope.$apply();
 
+        expect($browserUrl).toHaveBeenCalledOnce();
+        expect($browser.url()).toBe('http://new.com/a/b#!/new/path');
+      });
+    });
 
-    it('should update browser only once per $apply cycle', inject(function($rootScope, $browser, $location) {
-      var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
-      $location.path('/new/path');
 
-      $rootScope.$watch(function() {
-        $location.search('a=b');
+    it('should update browser only once per $apply cycle', function() {
+      initService({html5Mode:false,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#!', baseHref:'/a/b'});
+      inject(function($rootScope, $browser, $location) {
+        var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+        $location.path('/new/path');
+
+        $rootScope.$watch(function() {
+          $location.search('a=b');
+        });
+
+        $rootScope.$apply();
+        expect($browserUrl).toHaveBeenCalledOnce();
+        expect($browser.url()).toBe('http://new.com/a/b#!/new/path?a=b');
       });
+    });
 
-      $rootScope.$apply();
-      expect($browserUrl).toHaveBeenCalledOnce();
-      expect($browser.url()).toBe('http://new.com/a/b#!/new/path?a=b');
-    }));
 
+    it('should replace browser url when url was replaced at least once', function() {
+      initService({html5Mode:false,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#!', baseHref:'/a/b'});
+      inject(function($rootScope, $browser, $location) {
+        var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
+        $location.path('/n/url').replace();
+        $rootScope.$apply();
 
-    it('should replace browser url when url was replaced at least once',
-        inject(function($rootScope, $location, $browser) {
-      var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
-      $location.path('/n/url').replace();
-      $rootScope.$apply();
+        expect($browserUrl).toHaveBeenCalledOnce();
+        expect($browserUrl.mostRecentCall.args).toEqual(['http://new.com/a/b#!/n/url', true, null]);
+        expect($location.$$replace).toBe(false);
+      });
+    });
 
-      expect($browserUrl).toHaveBeenCalledOnce();
-      expect($browserUrl.mostRecentCall.args).toEqual(['http://new.com/a/b#!/n/url', true, null]);
-      expect($location.$$replace).toBe(false);
-    }));
 
+    it('should always reset replace flag after running watch',  function() {
+      initService({html5Mode:false,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#!', baseHref:'/a/b'});
+      inject(function($rootScope, $browser, $location) {
+        // init watches
+        $location.url('/initUrl');
+        $rootScope.$apply();
 
-    it('should always reset replace flag after running watch', inject(function($rootScope, $location) {
-      // init watches
-      $location.url('/initUrl');
-      $rootScope.$apply();
+        // changes url but resets it before digest
+        $location.url('/newUrl').replace().url('/initUrl');
+        $rootScope.$apply();
+        expect($location.$$replace).toBe(false);
 
-      // changes url but resets it before digest
-      $location.url('/newUrl').replace().url('/initUrl');
-      $rootScope.$apply();
-      expect($location.$$replace).toBe(false);
+        // set the url to the old value
+        $location.url('/newUrl').replace();
+        $rootScope.$apply();
+        expect($location.$$replace).toBe(false);
 
-      // set the url to the old value
-      $location.url('/newUrl').replace();
-      $rootScope.$apply();
-      expect($location.$$replace).toBe(false);
+        // doesn't even change url only calls replace()
+        $location.replace();
+        $rootScope.$apply();
+        expect($location.$$replace).toBe(false);
+      });
+    });
 
-      // doesn't even change url only calls replace()
-      $location.replace();
-      $rootScope.$apply();
-      expect($location.$$replace).toBe(false);
-    }));
 
+    it('should update the browser if changed from within a watcher',  function() {
+      initService({html5Mode:false,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b#!', baseHref:'/a/b'});
+      inject(function($rootScope, $browser, $location) {
+        $rootScope.$watch(function() { return true; }, function() {
+          $location.path('/changed');
+        });
 
-    it('should update the browser if changed from within a watcher', inject(function($rootScope, $location, $browser) {
-      $rootScope.$watch(function() { return true; }, function() {
-        $location.path('/changed');
+        $rootScope.$digest();
+        expect($browser.url()).toBe('http://new.com/a/b#!/changed');
       });
+    });
 
-      $rootScope.$digest();
-      expect($browser.url()).toBe('http://new.com/a/b#!/changed');
-    }));
+
+    it('should not infinitely digest if hash is set when there is no hashPrefix', function() {
+      initService({html5Mode:false, hashPrefix:'', supportHistory:true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b', baseHref:'/a/b'});
+      inject(function($rootScope, $browser, $location) {
+        $location.hash('test');
+
+        $rootScope.$digest();
+        expect($browser.url()).toBe('http://new.com/a/b##test');
+      });
+    });
   });
 
   describe('wiring in html5 mode', function() {
 
-    beforeEach(initService({html5Mode: true, supportHistory: true}));
-    beforeEach(inject(initBrowser({url:'http://new.com/a/b/', basePath: '/a/b/'})));
-
-    it('should initialize state to $browser.state()', inject(function($browser) {
-      $browser.$$state = {a: 2};
+    it('should initialize state to initial state from the browser',  function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/', state: {a: 2}});
       inject(function($location) {
         expect($location.state()).toEqual({a: 2});
       });
-    }));
+    });
 
-    it('should update $location when browser state changes', inject(function($browser, $location) {
-      $browser.url('http://new.com/a/b/', false, {b: 3});
-      $browser.poll();
-      expect($location.state()).toEqual({b: 3});
-    }));
+    it('should update $location when browser state changes', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
+      inject(function($location, $window) {
+        $window.history.pushState({b: 3});
+        expect($location.state()).toEqual({b: 3});
+      });
+    });
 
-    it('should replace browser url & state when replace() was called at least once',
+    it('should replace browser url & state when replace() was called at least once', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
       inject(function($rootScope, $location, $browser) {
         var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
         $location.path('/n/url').state({a: 2}).replace();
@@ -833,9 +1033,13 @@ describe('$location', function() {
         expect($browserUrl.mostRecentCall.args).toEqual(['http://new.com/a/b/n/url', true, {a: 2}]);
         expect($location.$$replace).toBe(false);
         expect($location.$$state).toEqual({a: 2});
-      }));
+      });
+    });
+
+    it('should use only the most recent url & state definition', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
 
-    it('should use only the most recent url & state definition',
       inject(function($rootScope, $location, $browser) {
         var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
         $location.path('/n/url').state({a: 2}).replace().state({b: 3}).path('/o/url');
@@ -845,9 +1049,13 @@ describe('$location', function() {
         expect($browserUrl.mostRecentCall.args).toEqual(['http://new.com/a/b/o/url', true, {b: 3}]);
         expect($location.$$replace).toBe(false);
         expect($location.$$state).toEqual({b: 3});
-      }));
+      });
+    });
+
+    it('should allow to set state without touching the URL', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
 
-    it('should allow to set state without touching the URL',
       inject(function($rootScope, $location, $browser) {
         var $browserUrl = spyOnlyCallsWithArgs($browser, 'url').andCallThrough();
         $location.state({a: 2}).replace().state({b: 3});
@@ -857,30 +1065,39 @@ describe('$location', function() {
         expect($browserUrl.mostRecentCall.args).toEqual(['http://new.com/a/b/', true, {b: 3}]);
         expect($location.$$replace).toBe(false);
         expect($location.$$state).toEqual({b: 3});
-      }));
+      });
+    });
 
-    it('should always reset replace flag after running watch', inject(function($rootScope, $location) {
-      // init watches
-      $location.url('/initUrl').state({a: 2});
-      $rootScope.$apply();
+    it('should always reset replace flag after running watch', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
 
-      // changes url & state but resets them before digest
-      $location.url('/newUrl').state({a: 2}).replace().state({b: 3}).url('/initUrl');
-      $rootScope.$apply();
-      expect($location.$$replace).toBe(false);
+      inject(function($rootScope, $location) {
+        // init watches
+        $location.url('/initUrl').state({a: 2});
+        $rootScope.$apply();
 
-      // set the url to the old value
-      $location.url('/newUrl').state({a: 2}).replace();
-      $rootScope.$apply();
-      expect($location.$$replace).toBe(false);
+        // changes url & state but resets them before digest
+        $location.url('/newUrl').state({a: 2}).replace().state({b: 3}).url('/initUrl');
+        $rootScope.$apply();
+        expect($location.$$replace).toBe(false);
 
-      // doesn't even change url only calls replace()
-      $location.replace();
-      $rootScope.$apply();
-      expect($location.$$replace).toBe(false);
-    }));
+        // set the url to the old value
+        $location.url('/newUrl').state({a: 2}).replace();
+        $rootScope.$apply();
+        expect($location.$$replace).toBe(false);
+
+        // doesn't even change url only calls replace()
+        $location.replace();
+        $rootScope.$apply();
+        expect($location.$$replace).toBe(false);
+      });
+    });
+
+    it('should allow to modify state only before digest', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
 
-    it('should allow to modify state only before digest',
       inject(function($rootScope, $location, $browser) {
         var o = {a: 2};
         $location.state(o);
@@ -891,23 +1108,35 @@ describe('$location', function() {
         o.a = 4;
         $rootScope.$apply();
         expect($browser.state()).toEqual({a: 3});
-      }));
+      });
+    });
+
+    it('should make $location.state() referencially identical with $browser.state() after digest', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
 
-    it('should make $location.state() referencially identical with $browser.state() after digest',
       inject(function($rootScope, $location, $browser) {
         $location.state({a: 2});
         $rootScope.$apply();
         expect($location.state()).toBe($browser.state());
-      }));
+      });
+    });
+
+    it('should allow to query the state after digest', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
 
-    it('should allow to query the state after digest',
       inject(function($rootScope, $location) {
         $location.url('/foo').state({a: 2});
         $rootScope.$apply();
         expect($location.state()).toEqual({a: 2});
-      }));
+      });
+    });
+
+    it('should reset the state on .url() after digest', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
 
-    it('should reset the state on .url() after digest',
       inject(function($rootScope, $location, $browser) {
         $location.url('/foo').state({a: 2});
         $rootScope.$apply();
@@ -918,7 +1147,21 @@ describe('$location', function() {
 
         expect($browserUrl).toHaveBeenCalledOnce();
         expect($browserUrl.mostRecentCall.args).toEqual(['http://new.com/a/b/bar', false, null]);
-      }));
+      });
+    });
+
+    it('should force a page reload if navigating outside of the application base href', function() {
+      initService({html5Mode:true, supportHistory: true});
+      mockUpBrowser({initialUrl:'http://new.com/a/b/', baseHref:'/a/b/'});
+
+      inject(function($window, $browser, $location) {
+        $window.location.href = 'http://new.com/a/outside.html';
+        spyOn($window.location, '$$setHref');
+        expect($window.location.$$setHref).not.toHaveBeenCalled();
+        $browser.$$checkUrlChange();
+        expect($window.location.$$setHref).toHaveBeenCalledWith('http://new.com/a/outside.html');
+      });
+    });
   });
 
 
@@ -927,8 +1170,8 @@ describe('$location', function() {
 
     it('should use hashbang url with hash prefix', function() {
       initService({html5Mode:false,hashPrefix: '!'});
+      mockUpBrowser({initialUrl:'http://domain.com/base/index.html#!/a/b', baseHref:'/base/index.html'});
       inject(
-        initBrowser({url:'http://domain.com/base/index.html#!/a/b',basePath: '/base/index.html'}),
         function($rootScope, $location, $browser) {
           expect($browser.url()).toBe('http://domain.com/base/index.html#!/a/b');
           $location.path('/new');
@@ -942,8 +1185,8 @@ describe('$location', function() {
 
     it('should use hashbang url without hash prefix', function() {
       initService({html5Mode:false,hashPrefix: ''});
+      mockUpBrowser({initialUrl:'http://domain.com/base/index.html#/a/b', baseHref:'/base/index.html'});
       inject(
-        initBrowser({url:'http://domain.com/base/index.html#/a/b',basePath: '/base/index.html'}),
         function($rootScope, $location, $browser) {
           expect($browser.url()).toBe('http://domain.com/base/index.html#/a/b');
           $location.path('/new');
@@ -959,10 +1202,6 @@ describe('$location', function() {
   // html5 history enabled, but not supported by browser
   describe('history on old browser', function() {
 
-    afterEach(inject(function($rootElement) {
-      dealoc($rootElement);
-    }));
-
     it('should use hashbang url with hash prefix', function() {
       initService({html5Mode:true,hashPrefix: '!!',supportHistory: false});
       inject(
@@ -977,7 +1216,6 @@ describe('$location', function() {
       );
     });
 
-
     it('should redirect to hashbang url when new url given', function() {
       initService({html5Mode:true,hashPrefix: '!'});
       inject(
@@ -1003,14 +1241,10 @@ describe('$location', function() {
   // html5 history enabled and supported by browser
   describe('history on new browser', function() {
 
-    afterEach(inject(function($rootElement) {
-      dealoc($rootElement);
-    }));
-
     it('should use new url', function() {
-      initService({html5Mode:true,hashPrefix: '',supportHistory: true});
+      initService({html5Mode:true,hashPrefix:'',supportHistory:true});
+      mockUpBrowser({initialUrl:'http://domain.com/base/old/index.html#a', baseHref:'/base/index.html'});
       inject(
-        initBrowser({url:'http://domain.com/base/old/index.html#a',basePath: '/base/index.html'}),
         function($rootScope, $location, $browser) {
           expect($browser.url()).toBe('http://domain.com/base/old/index.html#a');
           $location.path('/new');
@@ -1024,8 +1258,8 @@ describe('$location', function() {
 
     it('should rewrite when hashbang url given', function() {
       initService({html5Mode:true,hashPrefix: '!',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://domain.com/base/index.html#!/a/b', baseHref:'/base/index.html'});
       inject(
-        initBrowser({url:'http://domain.com/base/index.html#!/a/b',basePath: '/base/index.html'}),
         function($rootScope, $location, $browser) {
           expect($browser.url()).toBe('http://domain.com/base/a/b');
           $location.path('/new');
@@ -1040,8 +1274,8 @@ describe('$location', function() {
 
     it('should rewrite when hashbang url given (without hash prefix)', function() {
       initService({html5Mode:true,hashPrefix: '',supportHistory: true});
+      mockUpBrowser({initialUrl:'http://domain.com/base/index.html#/a/b', baseHref:'/base/index.html'});
       inject(
-        initBrowser({url:'http://domain.com/base/index.html#/a/b',basePath: '/base/index.html'}),
         function($rootScope, $location, $browser) {
           expect($browser.url()).toBe('http://domain.com/base/a/b');
           expect($location.path()).toBe('/a/b');
@@ -1084,37 +1318,30 @@ describe('$location', function() {
 
     var root, link, originalBrowser, lastEventPreventDefault;
 
-    function configureService(options) {
+    function configureTestLink(options) {
       var linkHref = options.linkHref,
-          html5Mode = options.html5Mode,
-          supportHist = options.supportHist,
           relLink = options.relLink,
           attrs = options.attrs,
           content = options.content;
 
-      module(function($provide, $locationProvider) {
-        attrs = attrs ? ' ' + attrs + ' ' : '';
+      attrs = attrs ? ' ' + attrs + ' ' : '';
 
-        if (typeof linkHref === 'string') {
-          if (!relLink) {
-            if (linkHref[0] == '/') {
-              linkHref = 'http://host.com' + linkHref;
-            } else if (!linkHref.match(/:\/\//)) {
-              // fake the behavior of <base> tag
-              linkHref = 'http://host.com/base/' + linkHref;
-            }
-          }
+      if (typeof linkHref === 'string' && !relLink) {
+        if (linkHref[0] == '/') {
+          linkHref = 'http://host.com' + linkHref;
+        } else if (!linkHref.match(/:\/\//)) {
+          // fake the behavior of <base> tag
+          linkHref = 'http://host.com/base/' + linkHref;
         }
+      }
 
-        if (linkHref) {
-          link = jqLite('<a href="' + linkHref + '"' + attrs + '>' + content + '</a>')[0];
-        } else {
-          link = jqLite('<a ' + attrs + '>' + content + '</a>')[0];
-        }
+      if (linkHref) {
+        link = jqLite('<a href="' + linkHref + '"' + attrs + '>' + content + '</a>')[0];
+      } else {
+        link = jqLite('<a ' + attrs + '>' + content + '</a>')[0];
+      }
 
-        $provide.value('$sniffer', {history: supportHist});
-        $locationProvider.html5Mode(html5Mode);
-        $locationProvider.hashPrefix('!');
+      module(function($provide) {
         return function($rootElement, $document) {
           $rootElement.append(link);
           root = $rootElement[0];
@@ -1124,14 +1351,7 @@ describe('$location', function() {
       });
     }
 
-    function initBrowser() {
-      return function($browser, $document) {
-        $browser.url('http://host.com/base/index.html');
-        $browser.$$baseHref = '/base/index.html';
-      };
-    }
-
-    function initLocation() {
+    function setupRewriteChecks() {
       return function($browser, $location, $rootElement) {
         originalBrowser = $browser.url();
         // we have to prevent the default operation, as we need to test absolute links (http://...)
@@ -1160,10 +1380,11 @@ describe('$location', function() {
 
 
     it('should rewrite rel link to new url when history enabled on new browser', function() {
-      configureService({linkHref: 'link?a#b', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: 'link?a#b'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectRewriteTo($browser, 'http://host.com/base/link?a#b');
@@ -1173,10 +1394,11 @@ describe('$location', function() {
 
 
     it('should do nothing if already on the same URL', function() {
-      configureService({linkHref: '/base/', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: '/base/'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectRewriteTo($browser, 'http://host.com/base/');
@@ -1200,10 +1422,11 @@ describe('$location', function() {
 
 
     it('should rewrite abs link to new url when history enabled on new browser', function() {
-      configureService({linkHref: '/base/link?a#b', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: '/base/link?a#b'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectRewriteTo($browser, 'http://host.com/base/link?a#b');
@@ -1213,10 +1436,11 @@ describe('$location', function() {
 
 
     it('should rewrite rel link to hashbang url when history enabled on old browser', function() {
-      configureService({linkHref: 'link?a#b', html5Mode: true, supportHist: false});
+      configureTestLink({linkHref: 'link?a#b'});
+      initService({html5Mode:true,supportHistory:false,hashPrefix:'!'});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectRewriteTo($browser, 'http://host.com/base/index.html#!/link?a#b');
@@ -1227,10 +1451,11 @@ describe('$location', function() {
 
     // Regression (gh-7721)
     it('should not throw when clicking anchor with no href attribute when history enabled on old browser', function() {
-      configureService({linkHref: null, html5Mode: true, supportHist: false});
+      configureTestLink({linkHref: null});
+      initService({html5Mode:true,supportHistory:false});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1240,10 +1465,11 @@ describe('$location', function() {
 
 
     it('should produce relative paths correctly when $location.path() is "/" when history enabled on old browser', function() {
-      configureService({linkHref: 'partial1', html5Mode: true, supportHist: false});
+      configureTestLink({linkHref: 'partial1'});
+      initService({html5Mode:true,supportHistory:false,hashPrefix:'!'});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser, $location, $rootScope) {
           $rootScope.$apply(function() {
             $location.path('/');
@@ -1256,10 +1482,11 @@ describe('$location', function() {
 
 
     it('should rewrite abs link to hashbang url when history enabled on old browser', function() {
-      configureService({linkHref: '/base/link?a#b', html5Mode: true, supportHist: false});
+      configureTestLink({linkHref: '/base/link?a#b'});
+      initService({html5Mode:true,supportHistory:false,hashPrefix:'!'});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectRewriteTo($browser, 'http://host.com/base/index.html#!/link?a#b');
@@ -1269,10 +1496,11 @@ describe('$location', function() {
 
 
     it('should not rewrite full url links to different domain', function() {
-      configureService({linkHref: 'http://www.dot.abc/a?b=c', html5Mode: true});
+      configureTestLink({linkHref: 'http://www.dot.abc/a?b=c'});
+      initService({html5Mode:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1282,10 +1510,11 @@ describe('$location', function() {
 
 
     it('should not rewrite links with target="_blank"', function() {
-      configureService({linkHref: 'base/a?b=c', html5Mode: true, supportHist: true, attrs: 'target="_blank"'});
+      configureTestLink({linkHref: 'base/a?b=c', attrs: 'target="_blank"'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1295,10 +1524,11 @@ describe('$location', function() {
 
 
     it('should not rewrite links with target specified', function() {
-      configureService({linkHref: 'base/a?b=c', html5Mode: true, supportHist: true, attrs: 'target="some-frame"'});
+      configureTestLink({linkHref: 'base/a?b=c', attrs: 'target="some-frame"'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1308,10 +1538,11 @@ describe('$location', function() {
 
 
     it('should not rewrite links with `javascript:` URI', function() {
-      configureService({linkHref: ' jAvAsCrIpT:throw new Error("Boom!")', html5Mode: true, supportHist: true, relLink: true});
+      configureTestLink({linkHref: ' jAvAsCrIpT:throw new Error("Boom!")', relLink: true});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1321,10 +1552,11 @@ describe('$location', function() {
 
 
     it('should not rewrite links with `mailto:` URI', function() {
-      configureService({linkHref: ' mAiLtO:foo@bar.com', html5Mode: true, supportHist: true, relLink: true});
+      configureTestLink({linkHref: ' mAiLtO:foo@bar.com', relLink: true});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1334,10 +1566,11 @@ describe('$location', function() {
 
 
     it('should not rewrite links when rewriting links is disabled', function() {
-      configureService({linkHref: 'link?a#b', html5Mode: {enabled: true, rewriteLinks:false}, supportHist: true});
+      configureTestLink({linkHref: 'link?a#b', html5Mode: {enabled: true, rewriteLinks:false}, supportHist: true});
+      initService({html5Mode:{enabled: true, rewriteLinks:false},supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1347,10 +1580,11 @@ describe('$location', function() {
 
 
     it('should rewrite full url links to same domain and base path', function() {
-      configureService({linkHref: 'http://host.com/base/new', html5Mode: true});
+      configureTestLink({linkHref: 'http://host.com/base/new'});
+      initService({html5Mode:true,supportHistory:false,hashPrefix:'!'});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectRewriteTo($browser, 'http://host.com/base/index.html#!/new');
@@ -1360,10 +1594,11 @@ describe('$location', function() {
 
 
     it('should rewrite when clicked span inside link', function() {
-      configureService({linkHref: 'some/link', html5Mode: true, supportHist: true, attrs: '', content: '<span>link</span>'});
+      configureTestLink({linkHref: 'some/link', attrs: '', content: '<span>link</span>'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           var span = jqLite(link).find('span');
 
@@ -1376,10 +1611,11 @@ describe('$location', function() {
 
     it('should not rewrite when link to different base path when history enabled on new browser',
         function() {
-      configureService({linkHref: '/other_base/link', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: '/other_base/link'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1390,10 +1626,11 @@ describe('$location', function() {
 
     it('should not rewrite when link to different base path when history enabled on old browser',
         function() {
-      configureService({linkHref: '/other_base/link', html5Mode: true, supportHist: false});
+      configureTestLink({linkHref: '/other_base/link'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1403,10 +1640,11 @@ describe('$location', function() {
 
 
     it('should not rewrite when link to different base path when history disabled', function() {
-      configureService({linkHref: '/other_base/link', html5Mode: false});
+      configureTestLink({linkHref: '/other_base/link'});
+      initService({html5Mode:false});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1417,10 +1655,11 @@ describe('$location', function() {
 
     it('should not rewrite when full link to different base path when history enabled on new browser',
         function() {
-      configureService({linkHref: 'http://host.com/other_base/link', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: 'http://host.com/other_base/link'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1431,10 +1670,10 @@ describe('$location', function() {
 
     it('should not rewrite when full link to different base path when history enabled on old browser',
         function() {
-      configureService({linkHref: 'http://host.com/other_base/link', html5Mode: true, supportHist: false});
+      configureTestLink({linkHref: 'http://host.com/other_base/link', html5Mode: true, supportHist: false});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1444,10 +1683,11 @@ describe('$location', function() {
 
 
     it('should not rewrite when full link to different base path when history disabled', function() {
-      configureService({linkHref: 'http://host.com/other_base/link', html5Mode: false});
+      configureTestLink({linkHref: 'http://host.com/other_base/link'});
+      initService({html5Mode:false});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click');
           expectNoRewrite($browser);
@@ -1456,10 +1696,11 @@ describe('$location', function() {
     });
 
     it('should replace current hash fragment when link begins with "#" history disabled', function() {
-      configureService({linkHref: '#link', html5Mode: true, supportHist: false, relLink: true});
+      configureTestLink({linkHref: '#link', relLink: true});
+      initService({html5Mode:true,supportHistory:false,hashPrefix:'!'});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser, $location, $rootScope) {
           $rootScope.$apply(function() {
             $location.path('/some');
@@ -1473,10 +1714,11 @@ describe('$location', function() {
     });
 
     it('should replace current hash fragment when link begins with "#" history enabled', function() {
-      configureService({linkHref: '#link', html5Mode: true, supportHist: true, relLink: true});
+      configureTestLink({linkHref: '#link', relLink: true});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser, $location, $rootScope) {
           $rootScope.$apply(function() {
             $location.path('/some');
@@ -1490,10 +1732,11 @@ describe('$location', function() {
     });
 
     it('should not rewrite when clicked with ctrl pressed', function() {
-      configureService({linkHref: 'base/a?b=c', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: 'base/a?b=c'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click', { keys: ['ctrl'] });
           expectNoRewrite($browser);
@@ -1503,10 +1746,11 @@ describe('$location', function() {
 
 
     it('should not rewrite when clicked with meta pressed', function() {
-      configureService({linkHref: 'base/a?b=c', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: 'base/a?b=c'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click', { keys: ['meta'] });
           expectNoRewrite($browser);
@@ -1515,10 +1759,11 @@ describe('$location', function() {
     });
 
     it('should not rewrite when right click pressed', function() {
-      configureService({linkHref: 'base/a?b=c', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: 'base/a?b=c'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           var rightClick;
           if (document.createEvent) {
@@ -1550,10 +1795,11 @@ describe('$location', function() {
 
 
     it('should not rewrite when clicked with shift pressed', function() {
-      configureService({linkHref: 'base/a?b=c', html5Mode: true, supportHist: true});
+      configureTestLink({linkHref: 'base/a?b=c'});
+      initService({html5Mode:true,supportHistory:true});
       inject(
-        initBrowser(),
-        initLocation(),
+        initBrowser({ url: 'http://host.com/base/index.html', basePath: '/base/index.html' }),
+        setupRewriteChecks(),
         function($browser) {
           browserTrigger(link, 'click', { keys: ['shift'] });
           expectNoRewrite($browser);
@@ -2047,99 +2293,95 @@ describe('$location', function() {
     );
   });
 
-  function parseLinkAndReturn(location, url, relHref) {
-    if (location.$$parseLinkUrl(url, relHref)) {
-      return location.absUrl();
-    }
-    return undefined;
-  }
-
 
-  describe('html5Mode', function() {
-    it('should set enabled,  requireBase and rewriteLinks when called with object', function() {
-      module(function($locationProvider) {
-        $locationProvider.html5Mode({enabled: true, requireBase: false, rewriteLinks: false});
-        expect($locationProvider.html5Mode()).toEqual({
-          enabled: true,
-          requireBase: false,
-          rewriteLinks: false
+  describe('$locationProvider', function() {
+    describe('html5Mode', function() {
+      it('should set enabled,  requireBase and rewriteLinks when called with object', function() {
+        module(function($locationProvider) {
+          $locationProvider.html5Mode({enabled: true, requireBase: false, rewriteLinks: false});
+          expect($locationProvider.html5Mode()).toEqual({
+            enabled: true,
+            requireBase: false,
+            rewriteLinks: false
+          });
         });
+
+        inject(function() {});
       });
 
-      inject(function() {});
-    });
 
+      it('should only overwrite existing properties if values are boolean', function() {
+        module(function($locationProvider) {
+          $locationProvider.html5Mode({
+            enabled: 'duh',
+            requireBase: 'probably',
+            rewriteLinks: 'nope'
+          });
 
-    it('should only overwrite existing properties if values are boolean', function() {
-      module(function($locationProvider) {
-        $locationProvider.html5Mode({
-          enabled: 'duh',
-          requireBase: 'probably',
-          rewriteLinks: 'nope'
+          expect($locationProvider.html5Mode()).toEqual({
+            enabled: false,
+            requireBase: true,
+            rewriteLinks: true
+          });
         });
 
-        expect($locationProvider.html5Mode()).toEqual({
-          enabled: false,
-          requireBase: true,
-          rewriteLinks: true
-        });
+        inject(function() {});
       });
 
-      inject(function() {});
-    });
 
+      it('should not set unknown input properties to html5Mode object', function() {
+        module(function($locationProvider) {
+          $locationProvider.html5Mode({
+            someProp: 'foo'
+          });
 
-    it('should not set unknown input properties to html5Mode object', function() {
-      module(function($locationProvider) {
-        $locationProvider.html5Mode({
-          someProp: 'foo'
+          expect($locationProvider.html5Mode()).toEqual({
+            enabled: false,
+            requireBase: true,
+            rewriteLinks: true
+          });
         });
 
-        expect($locationProvider.html5Mode()).toEqual({
-          enabled: false,
-          requireBase: true,
-          rewriteLinks: true
-        });
+        inject(function() {});
       });
 
-      inject(function() {});
-    });
-
 
-    it('should default to enabled:false, requireBase:true and rewriteLinks:true', function() {
-      module(function($locationProvider) {
-        expect($locationProvider.html5Mode()).toEqual({
-          enabled: false,
-          requireBase: true,
-          rewriteLinks: true
+      it('should default to enabled:false, requireBase:true and rewriteLinks:true', function() {
+        module(function($locationProvider) {
+          expect($locationProvider.html5Mode()).toEqual({
+            enabled: false,
+            requireBase: true,
+            rewriteLinks: true
+          });
         });
-      });
 
-      inject(function() {});
+        inject(function() {});
+      });
     });
   });
 
+
   describe('LocationHtml5Url', function() {
-    var location, locationIndex;
+    var locationUrl, locationIndexUrl;
 
     beforeEach(function() {
-      location = new LocationHtml5Url('http://server/pre/', 'http://server/pre/path');
-      locationIndex = new LocationHtml5Url('http://server/pre/index.html', 'http://server/pre/path');
+      locationUrl = new LocationHtml5Url('http://server/pre/', 'http://server/pre/', 'http://server/pre/path');
+      locationIndexUrl = new LocationHtml5Url('http://server/pre/index.html', 'http://server/pre/', 'http://server/pre/path');
     });
 
     it('should rewrite URL', function() {
-      expect(parseLinkAndReturn(location, 'http://other')).toEqual(undefined);
-      expect(parseLinkAndReturn(location, 'http://server/pre')).toEqual('http://server/pre/');
-      expect(parseLinkAndReturn(location, 'http://server/pre/')).toEqual('http://server/pre/');
-      expect(parseLinkAndReturn(location, 'http://server/pre/otherPath')).toEqual('http://server/pre/otherPath');
+      expect(parseLinkAndReturn(locationUrl, 'http://other')).toEqual(undefined);
+      expect(parseLinkAndReturn(locationUrl, 'http://server/pre')).toEqual('http://server/pre/');
+      expect(parseLinkAndReturn(locationUrl, 'http://server/pre/')).toEqual('http://server/pre/');
+      expect(parseLinkAndReturn(locationUrl, 'http://server/pre/otherPath')).toEqual('http://server/pre/otherPath');
       // Note: relies on the previous state!
-      expect(parseLinkAndReturn(location, 'someIgnoredAbsoluteHref', '#test')).toEqual('http://server/pre/otherPath#test');
+      expect(parseLinkAndReturn(locationUrl, 'someIgnoredAbsoluteHref', '#test')).toEqual('http://server/pre/otherPath#test');
 
-      expect(parseLinkAndReturn(locationIndex, 'http://server/pre')).toEqual('http://server/pre/');
-      expect(parseLinkAndReturn(locationIndex, 'http://server/pre/')).toEqual('http://server/pre/');
-      expect(parseLinkAndReturn(locationIndex, 'http://server/pre/otherPath')).toEqual('http://server/pre/otherPath');
+      expect(parseLinkAndReturn(locationIndexUrl, 'http://server/pre')).toEqual('http://server/pre/');
+      expect(parseLinkAndReturn(locationIndexUrl, 'http://server/pre/')).toEqual('http://server/pre/');
+      expect(parseLinkAndReturn(locationIndexUrl, 'http://server/pre/otherPath')).toEqual('http://server/pre/otherPath');
       // Note: relies on the previous state!
-      expect(parseLinkAndReturn(location, 'someIgnoredAbsoluteHref', '#test')).toEqual('http://server/pre/otherPath#test');
+      expect(parseLinkAndReturn(locationUrl, 'someIgnoredAbsoluteHref', '#test')).toEqual('http://server/pre/otherPath#test');
     });
 
 
@@ -2176,106 +2418,190 @@ describe('$location', function() {
     });
 
     it('should support state', function() {
-      expect(location.state({a: 2}).state()).toEqual({a: 2});
+      expect(locationUrl.state({a: 2}).state()).toEqual({a: 2});
     });
   });
 
 
-  function throwOnState(location) {
-    expect(function() {
-      location.state({a: 2});
-    }).toThrowMinErr('$location', 'nostate', 'History API state support is available only ' +
-      'in HTML5 mode and only in browsers supporting HTML5 History API'
-    );
-  }
-
   describe('LocationHashbangUrl', function() {
-    var location;
-
-    function parseLinkAndReturn(location, url, relHref) {
-      if (location.$$parseLinkUrl(url, relHref)) {
-        return location.absUrl();
-      }
-      return undefined;
-    }
+    var locationUrl;
 
     it('should rewrite URL', function() {
       /* jshint scripturl: true */
-      location = new LocationHashbangUrl('http://server/pre/', '#');
+      locationUrl = new LocationHashbangUrl('http://server/pre/', 'http://server/pre/', '#');
 
-      expect(parseLinkAndReturn(location, 'http://other')).toEqual(undefined);
-      expect(parseLinkAndReturn(location, 'http://server/pre/')).toEqual('http://server/pre/');
-      expect(parseLinkAndReturn(location, 'http://server/pre/#otherPath')).toEqual('http://server/pre/#/otherPath');
-      expect(parseLinkAndReturn(location, 'javascript:void(0)')).toEqual(undefined);
+      expect(parseLinkAndReturn(locationUrl, 'http://other')).toEqual(undefined);
+      expect(parseLinkAndReturn(locationUrl, 'http://server/pre/')).toEqual('http://server/pre/');
+      expect(parseLinkAndReturn(locationUrl, 'http://server/pre/#otherPath')).toEqual('http://server/pre/#/otherPath');
+      expect(parseLinkAndReturn(locationUrl, 'javascript:void(0)')).toEqual(undefined);
     });
 
     it("should not set hash if one was not originally specified", function() {
-      location = new LocationHashbangUrl('http://server/pre/index.html', '#');
+      locationUrl = new LocationHashbangUrl('http://server/pre/index.html', 'http://server/pre/', '#');
 
-      location.$$parse('http://server/pre/index.html');
-      expect(location.url()).toBe('');
-      expect(location.absUrl()).toBe('http://server/pre/index.html');
+      locationUrl.$$parse('http://server/pre/index.html');
+      expect(locationUrl.url()).toBe('');
+      expect(locationUrl.absUrl()).toBe('http://server/pre/index.html');
     });
 
     it("should parse hash if one was specified", function() {
-      location = new LocationHashbangUrl('http://server/pre/index.html', '#');
+      locationUrl = new LocationHashbangUrl('http://server/pre/index.html', 'http://server/pre/', '#');
 
-      location.$$parse('http://server/pre/index.html#/foo/bar');
-      expect(location.url()).toBe('/foo/bar');
-      expect(location.absUrl()).toBe('http://server/pre/index.html#/foo/bar');
+      locationUrl.$$parse('http://server/pre/index.html#/foo/bar');
+      expect(locationUrl.url()).toBe('/foo/bar');
+      expect(locationUrl.absUrl()).toBe('http://server/pre/index.html#/foo/bar');
     });
 
 
     it("should prefix hash url with / if one was originally missing", function() {
-      location = new LocationHashbangUrl('http://server/pre/index.html', '#');
+      locationUrl = new LocationHashbangUrl('http://server/pre/index.html', 'http://server/pre/', '#');
 
-      location.$$parse('http://server/pre/index.html#not-starting-with-slash');
-      expect(location.url()).toBe('/not-starting-with-slash');
-      expect(location.absUrl()).toBe('http://server/pre/index.html#/not-starting-with-slash');
+      locationUrl.$$parse('http://server/pre/index.html#not-starting-with-slash');
+      expect(locationUrl.url()).toBe('/not-starting-with-slash');
+      expect(locationUrl.absUrl()).toBe('http://server/pre/index.html#/not-starting-with-slash');
     });
 
 
     it('should not strip stuff from path just because it looks like Windows drive when it\'s not',
         function() {
-      location = new LocationHashbangUrl('http://server/pre/index.html', '#');
+      locationUrl = new LocationHashbangUrl('http://server/pre/index.html', 'http://server/pre/', '#');
 
-      location.$$parse('http://server/pre/index.html#http%3A%2F%2Fexample.com%2F');
-      expect(location.url()).toBe('/http://example.com/');
-      expect(location.absUrl()).toBe('http://server/pre/index.html#/http://example.com/');
+      locationUrl.$$parse('http://server/pre/index.html#http%3A%2F%2Fexample.com%2F');
+      expect(locationUrl.url()).toBe('/http://example.com/');
+      expect(locationUrl.absUrl()).toBe('http://server/pre/index.html#/http://example.com/');
     });
 
     it('should throw on url(urlString, stateObject)', function() {
-      throwOnState(location);
+      expectThrowOnStateChange(locationUrl);
+    });
+
+    it('should allow navigating outside the original base URL', function() {
+      locationUrl = new LocationHashbangUrl('http://server/pre/index.html', 'http://server/pre/', '#');
+
+      locationUrl.$$parse('http://server/next/index.html');
+      expect(locationUrl.url()).toBe('');
+      expect(locationUrl.absUrl()).toBe('http://server/next/index.html');
     });
   });
 
 
   describe('LocationHashbangInHtml5Url', function() {
     /* global LocationHashbangInHtml5Url: false */
-    var location, locationIndex;
+    var locationUrl, locationIndexUrl;
 
     beforeEach(function() {
-      location = new LocationHashbangInHtml5Url('http://server/pre/', '#!');
-      locationIndex = new LocationHashbangInHtml5Url('http://server/pre/index.html', '#!');
+      locationUrl = new LocationHashbangInHtml5Url('http://server/pre/', 'http://server/pre/', '#!');
+      locationIndexUrl = new LocationHashbangInHtml5Url('http://server/pre/index.html', 'http://server/pre/', '#!');
     });
 
     it('should rewrite URL', function() {
-      expect(parseLinkAndReturn(location, 'http://other')).toEqual(undefined);
-      expect(parseLinkAndReturn(location, 'http://server/pre')).toEqual('http://server/pre/#!');
-      expect(parseLinkAndReturn(location, 'http://server/pre/')).toEqual('http://server/pre/#!');
-      expect(parseLinkAndReturn(location, 'http://server/pre/otherPath')).toEqual('http://server/pre/#!/otherPath');
+      expect(parseLinkAndReturn(locationUrl, 'http://other')).toEqual(undefined);
+      expect(parseLinkAndReturn(locationUrl, 'http://server/pre')).toEqual('http://server/pre/#!');
+      expect(parseLinkAndReturn(locationUrl, 'http://server/pre/')).toEqual('http://server/pre/#!');
+      expect(parseLinkAndReturn(locationUrl, 'http://server/pre/otherPath')).toEqual('http://server/pre/#!/otherPath');
       // Note: relies on the previous state!
-      expect(parseLinkAndReturn(location, 'someIgnoredAbsoluteHref', '#test')).toEqual('http://server/pre/#!/otherPath#test');
+      expect(parseLinkAndReturn(locationUrl, 'someIgnoredAbsoluteHref', '#test')).toEqual('http://server/pre/#!/otherPath#test');
 
-      expect(parseLinkAndReturn(locationIndex, 'http://server/pre')).toEqual('http://server/pre/index.html#!');
-      expect(parseLinkAndReturn(locationIndex, 'http://server/pre/')).toEqual(undefined);
-      expect(parseLinkAndReturn(locationIndex, 'http://server/pre/otherPath')).toEqual('http://server/pre/index.html#!/otherPath');
+      expect(parseLinkAndReturn(locationIndexUrl, 'http://server/pre')).toEqual('http://server/pre/index.html#!');
+      expect(parseLinkAndReturn(locationIndexUrl, 'http://server/pre/')).toEqual(undefined);
+      expect(parseLinkAndReturn(locationIndexUrl, 'http://server/pre/otherPath')).toEqual('http://server/pre/index.html#!/otherPath');
       // Note: relies on the previous state!
-      expect(parseLinkAndReturn(locationIndex, 'someIgnoredAbsoluteHref', '#test')).toEqual('http://server/pre/index.html#!/otherPath#test');
+      expect(parseLinkAndReturn(locationIndexUrl, 'someIgnoredAbsoluteHref', '#test')).toEqual('http://server/pre/index.html#!/otherPath#test');
     });
 
     it('should throw on url(urlString, stateObject)', function() {
-      throwOnState(location);
+      expectThrowOnStateChange(locationUrl);
     });
   });
+
+
+  function initService(options) {
+    return module(function($provide, $locationProvider) {
+      $locationProvider.html5Mode(options.html5Mode);
+      $locationProvider.hashPrefix(options.hashPrefix);
+      $provide.value('$sniffer', {history: options.supportHistory});
+    });
+  }
+
+
+  function mockUpBrowser(options) {
+    module(function($windowProvider, $browserProvider) {
+      var browser;
+      var parser = window.document.createElement('a');
+      parser.href = options.initialUrl;
+
+      $windowProvider.$get = function() {
+        var win = {};
+        angular.extend(win, window);
+        // Ensure `window` is a reference to the mock global object, so that
+        // jqLite does the right thing.
+        win.window = win;
+        win.history = {
+          state: options.state || null,
+          replaceState: function(state, title, url) {
+            win.history.state = copy(state);
+            if (url) win.location.href = url;
+            jqLite(win).triggerHandler('popstate');
+          },
+          pushState: function(state, title, url) {
+            win.history.state = copy(state);
+            if (url) win.location.href = url;
+            jqLite(win).triggerHandler('popstate');
+          }
+        };
+        win.addEventListener = angular.noop;
+        win.removeEventListener = angular.noop;
+        win.location = {
+          get href() { return this.$$getHref(); },
+          $$getHref: function() { return parser.href; },
+          set href(val) { this.$$setHref(val); },
+          $$setHref: function(val) { parser.href = val; },
+          get hash() { return parser.hash; },
+          // The parser correctly strips on a single preceding hash character if necessary
+          // before joining the fragment onto the href by a new hash character
+          // See hash setter spec: https://url.spec.whatwg.org/#urlutils-and-urlutilsreadonly-members
+          set hash(val) { parser.hash = val; },
+
+          replace: function(val) {
+            win.location.href = val;
+          }
+        };
+        return win;
+      };
+      $browserProvider.$get = function($document, $window, $log, $sniffer) {
+        /* global Browser: false */
+        browser = new Browser($window, $document, $log, $sniffer);
+        browser.baseHref = function() {
+          return options.baseHref;
+        };
+        return browser;
+      };
+    });
+  }
+
+
+  function initBrowser(options) {
+    return function($browser) {
+      $browser.url(options.url);
+      $browser.$$baseHref = options.basePath;
+    };
+  }
+
+
+  function expectThrowOnStateChange(location) {
+    expect(function() {
+      location.state({a: 2});
+    }).toThrowMinErr('$location', 'nostate', 'History API state support is available only ' +
+      'in HTML5 mode and only in browsers supporting HTML5 History API'
+    );
+  }
+
+
+  function parseLinkAndReturn(location, url, relHref) {
+    if (location.$$parseLinkUrl(url, relHref)) {
+      return location.absUrl();
+    }
+    return undefined;
+  }
+
 });
diff --git a/test/ng/logSpec.js b/test/ng/logSpec.js
index d9a3cf57c405..cb7ad2d46937 100644
--- a/test/ng/logSpec.js
+++ b/test/ng/logSpec.js
@@ -1,12 +1,6 @@
 /* global $LogProvider: false */
 'use strict';
 
-function initService(debugEnabled) {
-    return module(function($logProvider) {
-      $logProvider.debugEnabled(debugEnabled);
-    });
-  }
-
 describe('$log', function() {
   var $window, logger, log, warn, info, error, debug;
 
@@ -178,4 +172,11 @@ describe('$log', function() {
       expect(errorArgs).toEqual(['abc', 'message\nsourceURL:123']);
     });
   });
+
+  function initService(debugEnabled) {
+    return module(function($logProvider) {
+      $logProvider.debugEnabled(debugEnabled);
+    });
+  }
+
 });
diff --git a/test/ng/parseSpec.js b/test/ng/parseSpec.js
index 2983c7ea6397..321cff48f93a 100644
--- a/test/ng/parseSpec.js
+++ b/test/ng/parseSpec.js
@@ -1745,6 +1745,16 @@ describe('parser', function() {
         expect(scope.$eval("0&&2")).toEqual(0 && 2);
         expect(scope.$eval("0||2")).toEqual(0 || 2);
         expect(scope.$eval("0||1&&2")).toEqual(0 || 1 && 2);
+        expect(scope.$eval("true&&a")).toEqual(true && undefined);
+        expect(scope.$eval("true&&a()")).toEqual(true && undefined);
+        expect(scope.$eval("true&&a()()")).toEqual(true && undefined);
+        expect(scope.$eval("true&&a.b")).toEqual(true && undefined);
+        expect(scope.$eval("true&&a.b.c")).toEqual(true && undefined);
+        expect(scope.$eval("false||a")).toEqual(false || undefined);
+        expect(scope.$eval("false||a()")).toEqual(false || undefined);
+        expect(scope.$eval("false||a()()")).toEqual(false || undefined);
+        expect(scope.$eval("false||a.b")).toEqual(false || undefined);
+        expect(scope.$eval("false||a.b.c")).toEqual(false || undefined);
       });
 
       it('should parse ternary', function() {
diff --git a/test/ng/qSpec.js b/test/ng/qSpec.js
index 643daf4d14bd..dbafc18fcfca 100644
--- a/test/ng/qSpec.js
+++ b/test/ng/qSpec.js
@@ -1643,6 +1643,14 @@ describe('q', function() {
     });
 
 
+    describe('resolve', function() {
+      it('should be an alias of the "when" function', function() {
+        expect(q.resolve).toBeDefined();
+        expect(q.resolve).toEqual(q.when);
+      });
+    });
+
+
     describe('optional callbacks', function() {
       it('should not require success callback and propagate resolution', function() {
         q.when('hi', null, error()).then(success(2), error());
diff --git a/test/ng/rafSpec.js b/test/ng/rafSpec.js
index 04ac6de211bc..e700d392aae4 100644
--- a/test/ng/rafSpec.js
+++ b/test/ng/rafSpec.js
@@ -31,6 +31,46 @@ describe('$$rAF', function() {
     expect(present).toBe(true);
   }));
 
+  it('should only consume only one RAF if multiple async functions are registered before the first frame kicks in', inject(function($$rAF) {
+    if (!$$rAF.supported) return;
+
+    //we need to create our own injector to work around the ngMock overrides
+    var rafLog = [];
+    var injector = createInjector(['ng', function($provide) {
+      $provide.value('$window', {
+        location: window.location,
+        history: window.history,
+        webkitRequestAnimationFrame: function(fn) {
+          rafLog.push(fn);
+        }
+      });
+    }]);
+
+    $$rAF = injector.get('$$rAF');
+
+    var log = [];
+    function logFn() {
+      log.push(log.length);
+    }
+
+    $$rAF(logFn);
+    $$rAF(logFn);
+    $$rAF(logFn);
+
+    expect(log).toEqual([]);
+    expect(rafLog.length).toBe(1);
+
+    rafLog[0]();
+
+    expect(log).toEqual([0,1,2]);
+    expect(rafLog.length).toBe(1);
+
+    $$rAF(logFn);
+
+    expect(log).toEqual([0,1,2]);
+    expect(rafLog.length).toBe(2);
+  }));
+
   describe('$timeout fallback', function() {
     it("it should use a $timeout incase native rAF isn't suppored", function() {
       var timeoutSpy = jasmine.createSpy('callback');
diff --git a/test/ng/rootScopeSpec.js b/test/ng/rootScopeSpec.js
index 75fb3232536c..a598499d6c3a 100644
--- a/test/ng/rootScopeSpec.js
+++ b/test/ng/rootScopeSpec.js
@@ -1021,16 +1021,40 @@ describe('Scope', function() {
 
 
     it('should broadcast $destroy on rootScope', inject(function($rootScope) {
-      var spy = spyOn(angular, 'noop');
-      $rootScope.$on('$destroy', angular.noop);
+      var spy = jasmine.createSpy('$destroy handler');
+      $rootScope.$on('$destroy', spy);
       $rootScope.$destroy();
-      $rootScope.$digest();
-      expect(log).toEqual('123');
       expect(spy).toHaveBeenCalled();
       expect($rootScope.$$destroyed).toBe(true);
     }));
 
 
+    it('should remove all listeners after $destroy of rootScope', inject(function($rootScope) {
+      var spy = jasmine.createSpy('$destroy handler');
+      $rootScope.$on('dummy', spy);
+      $rootScope.$destroy();
+      $rootScope.$broadcast('dummy');
+      expect(spy).not.toHaveBeenCalled();
+    }));
+
+
+    it('should remove all watchers after $destroy of rootScope', inject(function($rootScope) {
+      var spy = jasmine.createSpy('$watch spy');
+      var digest = $rootScope.$digest;
+      $rootScope.$watch(spy);
+      $rootScope.$destroy();
+      digest.call($rootScope);
+      expect(spy).not.toHaveBeenCalled();
+    }));
+
+
+    it('should call $browser.$$applicationDestroyed when destroying rootScope', inject(function($rootScope, $browser) {
+      spyOn($browser, '$$applicationDestroyed');
+      $rootScope.$destroy();
+      expect($browser.$$applicationDestroyed).toHaveBeenCalledOnce();
+    }));
+
+
     it('should remove first', inject(function($rootScope) {
       first.$destroy();
       $rootScope.$digest();
@@ -1481,6 +1505,22 @@ describe('Scope', function() {
       }));
 
 
+      it('should not clear the state when calling $apply during an $apply', inject(
+          function($rootScope) {
+        $rootScope.$apply(function() {
+          expect(function() {
+            $rootScope.$apply();
+          }).toThrowMinErr('$rootScope', 'inprog', '$apply already in progress');
+          expect(function() {
+            $rootScope.$apply();
+          }).toThrowMinErr('$rootScope', 'inprog', '$apply already in progress');
+        });
+        expect(function() {
+          $rootScope.$apply();
+        }).not.toThrow();
+      }));
+
+
       it('should throw an exception if $apply is called while flushing evalAsync queue', inject(
           function($rootScope) {
         expect(function() {
diff --git a/test/ng/sceSpecs.js b/test/ng/sceSpecs.js
index 11006744d18f..a35f6f3d83b7 100644
--- a/test/ng/sceSpecs.js
+++ b/test/ng/sceSpecs.js
@@ -2,12 +2,6 @@
 
 describe('SCE', function() {
 
-  // Work around an IE8 bug.  Though window.inject === angular.mock.inject, if it's invoked the
-  // window scope, IE8 loses the exception object that bubbles up and replaces it with a TypeError.
-  // By using a local alias, it gets invoked on the global scope instead of window.
-  // Ref: https://github.com/angular/angular.js/pull/4221#/issuecomment-25515813
-  var inject = angular.mock.inject;
-
   describe('when disabled', function() {
     beforeEach(function() {
       module(function($sceProvider) {
diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js
index cd4728e3bb1d..c16d4802d966 100644
--- a/test/ng/snifferSpec.js
+++ b/test/ng/snifferSpec.js
@@ -73,8 +73,11 @@ describe('$sniffer', function() {
 
 
   describe('csp', function() {
-    it('should be false by default', function() {
-      expect(sniffer({}).csp).toBe(false);
+    it('should have all rules set to false by default', function() {
+      var csp = sniffer({}).csp;
+      forEach(Object.keys(csp), function(key) {
+        expect(csp[key]).toEqual(false);
+      });
     });
   });
 
diff --git a/test/ng/timeoutSpec.js b/test/ng/timeoutSpec.js
index c3582af5a94b..2aed8b743a5f 100644
--- a/test/ng/timeoutSpec.js
+++ b/test/ng/timeoutSpec.js
@@ -22,7 +22,7 @@ describe('$timeout', function() {
   it('should call $apply after each callback is executed', inject(function($timeout, $rootScope) {
     var applySpy = spyOn($rootScope, '$apply').andCallThrough();
 
-    $timeout(function() {});
+    $timeout(noop);
     expect(applySpy).not.toHaveBeenCalled();
 
     $timeout.flush();
@@ -30,8 +30,8 @@ describe('$timeout', function() {
 
     applySpy.reset();
 
-    $timeout(function() {});
-    $timeout(function() {});
+    $timeout(noop);
+    $timeout(noop);
     $timeout.flush();
     expect(applySpy.callCount).toBe(2);
   }));
@@ -40,7 +40,7 @@ describe('$timeout', function() {
   it('should NOT call $apply if skipApply is set to true', inject(function($timeout, $rootScope) {
     var applySpy = spyOn($rootScope, '$apply').andCallThrough();
 
-    $timeout(function() {}, 12, false);
+    $timeout(noop, 12, false);
     expect(applySpy).not.toHaveBeenCalled();
 
     $timeout.flush();
@@ -89,8 +89,8 @@ describe('$timeout', function() {
     // $browser.defer.cancel is only called on cancel if the deferred object is still referenced
     var cancelSpy = spyOn($browser.defer, 'cancel').andCallThrough();
 
-    var promise1 = $timeout(function() {}, 0, false);
-    var promise2 = $timeout(function() {}, 100, false);
+    var promise1 = $timeout(noop, 0, false);
+    var promise2 = $timeout(noop, 100, false);
     expect(cancelSpy).not.toHaveBeenCalled();
 
     $timeout.flush(0);
@@ -104,7 +104,6 @@ describe('$timeout', function() {
     expect(cancelSpy).toHaveBeenCalled();
   }));
 
-
   it('should allow the `fn` parameter to be optional', inject(function($timeout, log) {
 
     $timeout().then(function(value) { log('promise success: ' + value); }, log.fn('promise error'));
@@ -123,6 +122,35 @@ describe('$timeout', function() {
     expect(log).toEqual(['promise success: undefined']);
   }));
 
+  it('should pass the timeout arguments in the timeout callback',
+      inject(function($timeout, $browser, log) {
+    var task1 = jasmine.createSpy('Nappa'),
+        task2 = jasmine.createSpy('Vegeta');
+
+    $timeout(task1, 9000, true, 'What does', 'the timeout', 'say about', 'its delay level');
+    expect($browser.deferredFns.length).toBe(1);
+
+    $timeout(task2, 9001, false, 'It\'s', 'over', 9000);
+    expect($browser.deferredFns.length).toBe(2);
+
+    $timeout(9000, false, 'What!', 9000).then(function(value) { log('There\'s no way that can be right! ' + value); }, log.fn('It can\'t!'));
+    expect($browser.deferredFns.length).toBe(3);
+    expect(log).toEqual([]);
+
+    $timeout.flush(0);
+    expect(task1).not.toHaveBeenCalled();
+
+    $timeout.flush(9000);
+    expect(task1).toHaveBeenCalledWith('What does', 'the timeout', 'say about', 'its delay level');
+
+    $timeout.flush(1);
+    expect(task2).toHaveBeenCalledWith('It\'s', 'over', 9000);
+
+    $timeout.flush(9000);
+    expect(log).toEqual(['There\'s no way that can be right! undefined']);
+
+  }));
+
 
   describe('exception handling', function() {
 
@@ -133,7 +161,7 @@ describe('$timeout', function() {
 
     it('should delegate exception to the $exceptionHandler service', inject(
         function($timeout, $exceptionHandler) {
-      $timeout(function() {throw "Test Error";});
+      $timeout(function() { throw "Test Error"; });
       expect($exceptionHandler.errors).toEqual([]);
 
       $timeout.flush();
@@ -145,7 +173,7 @@ describe('$timeout', function() {
         function($timeout, $rootScope) {
       var applySpy = spyOn($rootScope, '$apply').andCallThrough();
 
-      $timeout(function() {throw "Test Error";});
+      $timeout(function() { throw "Test Error"; });
       expect(applySpy).not.toHaveBeenCalled();
 
       $timeout.flush();
@@ -164,6 +192,25 @@ describe('$timeout', function() {
     }));
 
 
+    it('should pass the timeout arguments in the timeout callback even if an exception is thrown',
+        inject(function($timeout, log) {
+      var promise1 = $timeout(function(arg) { throw arg; }, 9000, true, 'Some Arguments');
+      var promise2 = $timeout(function(arg1, args2) { throw arg1 + ' ' + args2; }, 9001, false, 'Are Meant', 'To Be Thrown');
+
+      promise1.then(log.fn('success'), function(reason) { log('error: ' + reason); });
+      promise2.then(log.fn('success'), function(reason) { log('error: ' + reason); });
+
+      $timeout.flush(0);
+      expect(log).toEqual('');
+
+      $timeout.flush(9000);
+      expect(log).toEqual('error: Some Arguments');
+
+      $timeout.flush(1);
+      expect(log).toEqual('error: Some Arguments; error: Are Meant To Be Thrown');
+    }));
+
+
     it('should forget references to relevant deferred even when exception is thrown',
         inject(function($timeout, $browser) {
       // $browser.defer.cancel is only called on cancel if the deferred object is still referenced
@@ -242,7 +289,7 @@ describe('$timeout', function() {
       // $browser.defer.cancel is only called on cancel if the deferred object is still referenced
       var cancelSpy = spyOn($browser.defer, 'cancel').andCallThrough();
 
-      var promise = $timeout(function() {}, 0, false);
+      var promise = $timeout(noop, 0, false);
 
       expect(cancelSpy).not.toHaveBeenCalled();
       $timeout.cancel(promise);
diff --git a/test/ngAnimate/.jshintrc b/test/ngAnimate/.jshintrc
new file mode 100644
index 000000000000..b307fb405952
--- /dev/null
+++ b/test/ngAnimate/.jshintrc
@@ -0,0 +1,13 @@
+{
+  "extends": "../.jshintrc",
+  "browser": true,
+  "newcap": false,
+  "globals": {
+    "mergeAnimationOptions": false,
+    "prepareAnimationOptions": false,
+    "applyAnimationStyles": false,
+    "applyAnimationFromStyles": false,
+    "applyAnimationToStyles": false,
+    "applyAnimationClassesFactory": false
+  }
+}
diff --git a/test/ngAnimate/animateCssDriverSpec.js b/test/ngAnimate/animateCssDriverSpec.js
new file mode 100644
index 000000000000..fc4f56bc62a2
--- /dev/null
+++ b/test/ngAnimate/animateCssDriverSpec.js
@@ -0,0 +1,988 @@
+'use strict';
+
+describe("ngAnimate $$animateCssDriver", function() {
+
+  beforeEach(module('ngAnimate'));
+
+  function int(x) {
+    return parseInt(x, 10);
+  }
+
+  function hasAll(array, vals) {
+    for (var i = 0; i < vals.length; i++) {
+      if (array.indexOf(vals[i]) === -1) return false;
+    }
+    return true;
+  }
+
+  it('should return a noop driver handler if the browser does not support CSS transitions and keyframes', function() {
+    module(function($provide) {
+      $provide.value('$sniffer', {});
+    });
+    inject(function($$animateCssDriver) {
+      expect($$animateCssDriver).toBe(noop);
+    });
+  });
+
+  describe('when active', function() {
+    if (!browserSupportsCssAnimations()) return;
+
+    var element;
+    var ss;
+    afterEach(function() {
+      dealoc(element);
+      if (ss) {
+        ss.destroy();
+      }
+    });
+
+    var capturedAnimation;
+    var captureLog;
+    var driver;
+    var captureFn;
+    beforeEach(module(function($provide) {
+      capturedAnimation = null;
+      captureLog = [];
+      captureFn = noop;
+
+      $provide.factory('$animateCss', function($$AnimateRunner) {
+        return function() {
+          var runner = new $$AnimateRunner();
+
+          capturedAnimation = arguments;
+          captureFn.apply(null, arguments);
+          captureLog.push({
+            element: arguments[0],
+            args: arguments,
+            runner: runner
+          });
+
+          return {
+            $$willAnimate: true,
+            start: function() {
+              return runner;
+            }
+          };
+        };
+      });
+
+      element = jqLite('<div></div>');
+
+      return function($$animateCssDriver, $document, $window) {
+        driver = function(details, cb) {
+          return $$animateCssDriver(details, cb || noop);
+        };
+        ss = createMockStyleSheet($document, $window);
+      };
+    }));
+
+    it('should register the $$animateCssDriver into the list of drivers found in $animateProvider',
+      module(function($animateProvider) {
+
+      expect($animateProvider.drivers).toContain('$$animateCssDriver');
+    }));
+
+    it('should register the $$animateCssDriver into the list of drivers found in $animateProvider',
+      module(function($animateProvider) {
+
+      expect($animateProvider.drivers).toContain('$$animateCssDriver');
+    }));
+
+    describe("regular animations", function() {
+      it("should render an animation on the given element", inject(function() {
+        driver({ element: element });
+        expect(capturedAnimation[0]).toBe(element);
+      }));
+
+      it("should return an object with a start function", inject(function() {
+        var runner = driver({ element: element });
+        expect(isFunction(runner.start)).toBeTruthy();
+      }));
+
+      it("should not signal $animateCss to apply the classes early when animation is structural", inject(function() {
+        driver({ element: element });
+        expect(capturedAnimation[1].applyClassesEarly).toBeFalsy();
+
+        driver({ element: element, structural: true });
+        expect(capturedAnimation[1].applyClassesEarly).toBeFalsy();
+      }));
+
+      it("should only set the event value if the animation is structural", inject(function() {
+        driver({ element: element, structural: true, event: 'superman' });
+        expect(capturedAnimation[1].event).toBe('superman');
+
+        driver({ element: element, event: 'batman' });
+        expect(capturedAnimation[1].event).toBeFalsy();
+      }));
+    });
+
+    describe("anchored animations", function() {
+      var from, to, fromAnimation, toAnimation;
+
+      beforeEach(module(function() {
+        return function($rootElement, $$body) {
+          from = element;
+          to = jqLite('<div></div>');
+          fromAnimation = { element: from, event: 'enter' };
+          toAnimation = { element: to, event: 'leave' };
+          $rootElement.append(from);
+          $rootElement.append(to);
+
+          // we need to do this so that style detection works
+          $$body.append($rootElement);
+        };
+      }));
+
+      it("should not return anything if no animation is detected", function() {
+        module(function($provide) {
+          $provide.value('$animateCss', function() {
+            return { $$willAnimate: false };
+          });
+        });
+        inject(function() {
+          var runner = driver({
+            from: fromAnimation,
+            to: toAnimation
+          });
+          expect(runner).toBeFalsy();
+        });
+      });
+
+      it("should return a start method", inject(function() {
+        var animator = driver({
+          from: fromAnimation,
+          to: toAnimation
+        });
+        expect(isFunction(animator.start)).toBeTruthy();
+      }));
+
+      they("should return a runner with a $prop() method which will end the animation",
+        ['end', 'cancel'], function(method) {
+
+        var closeAnimation;
+        module(function($provide) {
+          $provide.factory('$animateCss', function($q, $$AnimateRunner) {
+            return function() {
+              return {
+                $$willAnimate: true,
+                start: function() {
+                  return new $$AnimateRunner({
+                    end: function() {
+                      closeAnimation();
+                    }
+                  });
+                }
+              };
+            };
+          });
+        });
+
+        inject(function() {
+          var animator = driver({
+            from: fromAnimation,
+            to: toAnimation
+          });
+
+          var animationClosed = false;
+          closeAnimation = function() {
+            animationClosed = true;
+          };
+
+          var runner = animator.start();
+
+          expect(isFunction(runner[method])).toBe(true);
+          runner[method]();
+          expect(animationClosed).toBe(true);
+        });
+      });
+
+      it("should end the animation for each of the from and to elements as well as all the anchors", function() {
+        var closeLog = {};
+        module(function($provide) {
+          $provide.factory('$animateCss', function($q, $$AnimateRunner) {
+            return function(element, options) {
+              var type = options.event || 'anchor';
+              closeLog[type] = closeLog[type] || [];
+              return {
+                $$willAnimate: true,
+                start: function() {
+                  return new $$AnimateRunner({
+                    end: function() {
+                      closeLog[type].push(element);
+                    }
+                  });
+                }
+              };
+            };
+          });
+        });
+
+        inject(function() {
+          //we'll just use one animation to make the test smaller
+          var anchorAnimation = {
+            'in': jqLite('<div></div>'),
+            'out': jqLite('<div></div>')
+          };
+
+          fromAnimation.structural = true;
+          fromAnimation.element.append(anchorAnimation['out']);
+          toAnimation.structural = true;
+          toAnimation.element.append(anchorAnimation['in']);
+
+          var animator = driver({
+            from: fromAnimation,
+            to: toAnimation,
+            anchors: [
+              anchorAnimation,
+              anchorAnimation,
+              anchorAnimation
+            ]
+          });
+
+          var runner = animator.start();
+          runner.end();
+
+          expect(closeLog.enter[0]).toEqual(fromAnimation.element);
+          expect(closeLog.leave[0]).toEqual(toAnimation.element);
+          expect(closeLog.anchor.length).toBe(3);
+        });
+      });
+
+      it("should render an animation on both the from and to elements", inject(function() {
+        captureFn = function(element, details) {
+          element.addClass(details.event);
+        };
+
+        fromAnimation.structural = true;
+        toAnimation.structural = true;
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation
+        });
+
+        expect(captureLog.length).toBe(2);
+        expect(fromAnimation.element).toHaveClass('enter');
+        expect(toAnimation.element).toHaveClass('leave');
+      }));
+
+      it("should start the animations on the from and to elements in parallel", function() {
+        var animationLog = [];
+        module(function($provide) {
+          $provide.factory('$animateCss', function($$AnimateRunner) {
+            return function(element, details) {
+              return {
+                $$willAnimate: true,
+                start: function() {
+                  animationLog.push([element, details.event]);
+                  return new $$AnimateRunner();
+                }
+              };
+            };
+          });
+        });
+        inject(function() {
+          fromAnimation.structural = true;
+          toAnimation.structural = true;
+
+          var runner = driver({
+            from: fromAnimation,
+            to: toAnimation
+          });
+
+          expect(animationLog.length).toBe(0);
+          runner.start();
+          expect(animationLog).toEqual([
+            [fromAnimation.element, 'enter'],
+            [toAnimation.element, 'leave']
+          ]);
+        });
+      });
+
+      it("should start an animation for each anchor", inject(function() {
+        var o1 = jqLite('<div></div>');
+        from.append(o1);
+        var o2 = jqLite('<div></div>');
+        from.append(o2);
+        var o3 = jqLite('<div></div>');
+        from.append(o3);
+
+        var i1 = jqLite('<div></div>');
+        to.append(i1);
+        var i2 = jqLite('<div></div>');
+        to.append(i2);
+        var i3 = jqLite('<div></div>');
+        to.append(i3);
+
+        var anchors = [
+          { 'out': o1, 'in': i1, classes: 'red' },
+          { 'out': o2, 'in': i2, classes: 'blue' },
+          { 'out': o2, 'in': i2, classes: 'green' }
+        ];
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: anchors
+        });
+
+        expect(captureLog.length).toBe(5);
+      }));
+
+      it("should create a clone of the starting element for each anchor animation", inject(function() {
+        var o1 = jqLite('<div class="out1"></div>');
+        from.append(o1);
+        var o2 = jqLite('<div class="out2"></div>');
+        from.append(o2);
+
+        var i1 = jqLite('<div class="in1"></div>');
+        to.append(i1);
+        var i2 = jqLite('<div class="in2"></div>');
+        to.append(i2);
+
+        var anchors = [
+          { 'out': o1, 'in': i1 },
+          { 'out': o2, 'in': i2 }
+        ];
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: anchors
+        });
+
+        var a2 = captureLog.pop().element;
+        var a1 = captureLog.pop().element;
+
+        expect(a1).not.toEqual(o1);
+        expect(a1.attr('class')).toMatch(/\bout1\b/);
+        expect(a2).not.toEqual(o2);
+        expect(a2.attr('class')).toMatch(/\bout2\b/);
+      }));
+
+      it("should create a clone of the starting element and place it at the end of the $rootElement container",
+        inject(function($rootElement) {
+
+        //stick some garbage into the rootElement
+        $rootElement.append(jqLite('<div></div>'));
+        $rootElement.append(jqLite('<div></div>'));
+        $rootElement.append(jqLite('<div></div>'));
+
+        var fromAnchor = jqLite('<div class="out"></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div class="in"></div>');
+        to.append(toAnchor);
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'in': fromAnchor,
+            'out': toAnchor
+          }]
+        });
+
+        var anchor = captureLog.pop().element;
+        var anchorNode = anchor[0];
+        var contents = $rootElement.contents();
+
+        expect(contents.length).toBeGreaterThan(1);
+        expect(contents[contents.length - 1]).toEqual(anchorNode);
+      }));
+
+      it("should first do an addClass('ng-anchor-out') animation on the cloned anchor", inject(function($rootElement) {
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        });
+
+        var anchorDetails = captureLog.pop().args[1];
+        expect(anchorDetails.addClass).toBe('ng-anchor-out');
+        expect(anchorDetails.event).toBeFalsy();
+      }));
+
+      it("should then do an addClass('ng-anchor-in') animation on the cloned anchor and remove the old class",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        captureLog.pop().runner.end();
+        $$rAF.flush();
+
+        var anchorDetails = captureLog.pop().args[1];
+        expect(anchorDetails.removeClass.trim()).toBe('ng-anchor-out');
+        expect(anchorDetails.addClass.trim()).toBe('ng-anchor-in');
+        expect(anchorDetails.event).toBeFalsy();
+      }));
+
+      they("should only fire the ng-anchor-$prop animation if only a $prop animation is defined",
+        ['out', 'in'], function(direction) {
+
+        var expectedClass = 'ng-anchor-' + direction;
+        var animationStarted;
+        var runner;
+
+        module(function($provide) {
+          $provide.factory('$animateCss', function($$AnimateRunner) {
+            return function(element, options) {
+              var addClass = (options.addClass || '').trim();
+              return {
+                $$willAnimate: addClass === expectedClass,
+                start: function() {
+                  animationStarted = addClass;
+                  return runner = new $$AnimateRunner();
+                }
+              };
+            };
+          });
+        });
+
+        inject(function($rootElement, $$rAF) {
+          var fromAnchor = jqLite('<div></div>');
+          from.append(fromAnchor);
+          var toAnchor = jqLite('<div></div>');
+          to.append(toAnchor);
+
+          $rootElement.append(fromAnchor);
+          $rootElement.append(toAnchor);
+
+          var complete = false;
+
+          driver({
+            from: fromAnimation,
+            to: toAnimation,
+            anchors: [{
+              'out': fromAnchor,
+              'in': toAnchor
+            }]
+          }).start().done(function() {
+            complete = true;
+          });
+
+          expect(animationStarted).toBe(expectedClass);
+          runner.end();
+          $$rAF.flush();
+          expect(complete).toBe(true);
+        });
+      });
+
+
+      it("should provide an explicit delay setting in the options provided to $animateCss for anchor animations",
+        inject(function($rootElement) {
+
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        });
+
+        expect(capturedAnimation[1].delay).toBeTruthy();
+      }));
+
+      it("should begin the anchor animation by seeding the from styles based on where the from anchor element is positioned",
+        inject(function($rootElement) {
+
+        ss.addRule('.starting-element', 'width:200px; height:100px; display:block;');
+
+        var fromAnchor = jqLite('<div class="starting-element"' +
+                                    ' style="margin-top:500px; margin-left:150px;"></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        });
+
+        var anchorAnimation = captureLog.pop();
+        var anchorElement = anchorAnimation.element;
+        var anchorDetails = anchorAnimation.args[1];
+
+        var fromStyles = anchorDetails.from;
+        expect(int(fromStyles.width)).toBe(200);
+        expect(int(fromStyles.height)).toBe(100);
+        // some browsers have their own body margin defaults
+        expect(int(fromStyles.top)).toBeGreaterThan(499);
+        expect(int(fromStyles.left)).toBeGreaterThan(149);
+      }));
+
+      it("should append a `px` value for all seeded animation styles", inject(function($rootElement, $$rAF) {
+        ss.addRule('.starting-element', 'width:10px; height:20px; display:inline-block;');
+
+        var fromAnchor = jqLite('<div class="starting-element"' +
+                                    ' style="margin-top:30px; margin-left:40px;"></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        var runner = driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        });
+
+        var anchorAnimation = captureLog.pop();
+        var anchorDetails = anchorAnimation.args[1];
+
+        forEach(anchorDetails.from, function(value) {
+          expect(value.substr(value.length - 2)).toBe('px');
+        });
+
+        // the out animation goes first
+        anchorAnimation.runner.end();
+        $$rAF.flush();
+
+        anchorAnimation = captureLog.pop();
+        anchorDetails = anchorAnimation.args[1];
+
+        forEach(anchorDetails.to, function(value) {
+          expect(value.substr(value.length - 2)).toBe('px');
+        });
+      }));
+
+      it("should then do an removeClass('out') + addClass('in') animation on the cloned anchor",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        // the out animation goes first
+        captureLog.pop().runner.end();
+        $$rAF.flush();
+
+        var anchorDetails = captureLog.pop().args[1];
+        expect(anchorDetails.removeClass).toMatch(/\bout\b/);
+        expect(anchorDetails.addClass).toMatch(/\bin\b/);
+        expect(anchorDetails.event).toBeFalsy();
+      }));
+
+      it("should add the `ng-anchor` class to the cloned anchor element",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        var clonedAnchor = captureLog.pop().element;
+        expect(clonedAnchor).toHaveClass('ng-anchor');
+      }));
+
+      it("should add and remove the `ng-animate-shim` class on the in anchor element during the animation",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        expect(fromAnchor).toHaveClass('ng-animate-shim');
+
+        // the out animation goes first
+        captureLog.pop().runner.end();
+        $$rAF.flush();
+        captureLog.pop().runner.end();
+
+        expect(fromAnchor).not.toHaveClass('ng-animate-shim');
+      }));
+
+      it("should add and remove the `ng-animate-shim` class on the out anchor element during the animation",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        expect(toAnchor).toHaveClass('ng-animate-shim');
+
+        // the out animation goes first
+        captureLog.pop().runner.end();
+        $$rAF.flush();
+
+        expect(toAnchor).toHaveClass('ng-animate-shim');
+        captureLog.pop().runner.end();
+
+        expect(toAnchor).not.toHaveClass('ng-animate-shim');
+      }));
+
+      it("should create the cloned anchor with all of the classes from the from anchor element",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div class="yes no maybe"></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        var addedClasses = captureLog.pop().element.attr('class').split(' ');
+        expect(hasAll(addedClasses, ['yes', 'no', 'maybe'])).toBe(true);
+      }));
+
+      it("should remove the classes of the starting anchor from the cloned anchor node during the in animation and also add the classes of the destination anchor within the same animation",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div class="yes no maybe"></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div class="why ok so-what"></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        // the out animation goes first
+        captureLog.pop().runner.end();
+        $$rAF.flush();
+
+        var anchorDetails = captureLog.pop().args[1];
+        var removedClasses = anchorDetails.removeClass.split(' ');
+        var addedClasses = anchorDetails.addClass.split(' ');
+
+        expect(hasAll(removedClasses, ['yes', 'no', 'maybe'])).toBe(true);
+        expect(hasAll(addedClasses, ['why', 'ok', 'so-what'])).toBe(true);
+      }));
+
+      it("should not attempt to add/remove any classes that contain a `ng-` prefix",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div class="ng-yes ng-no sure"></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div class="ng-bar ng-foo maybe"></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        // the out animation goes first
+        captureLog.pop().runner.end();
+        $$rAF.flush();
+
+        var inAnimation = captureLog.pop();
+        var details = inAnimation.args[1];
+
+        var addedClasses = details.addClass.split(' ');
+        var removedClasses = details.removeClass.split(' ');
+
+        expect(addedClasses).not.toContain('ng-foo');
+        expect(addedClasses).not.toContain('ng-bar');
+
+        expect(removedClasses).not.toContain('ng-yes');
+        expect(removedClasses).not.toContain('ng-no');
+      }));
+
+      it("should not remove any shared CSS classes between the starting and destination anchor element during the in animation",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div class="blue green red"></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div class="blue brown red black"></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        // the out animation goes first
+        captureLog.pop().runner.end();
+        $$rAF.flush();
+
+        var inAnimation = captureLog.pop();
+        var clonedAnchor = inAnimation.element;
+        var details = inAnimation.args[1];
+
+        var addedClasses = details.addClass.split(' ');
+        var removedClasses = details.removeClass.split(' ');
+
+        expect(hasAll(addedClasses, ['brown', 'black'])).toBe(true);
+        expect(hasAll(removedClasses, ['green'])).toBe(true);
+
+        expect(addedClasses).not.toContain('red');
+        expect(addedClasses).not.toContain('blue');
+
+        expect(removedClasses).not.toContain('brown');
+        expect(removedClasses).not.toContain('black');
+
+        expect(removedClasses).not.toContain('red');
+        expect(removedClasses).not.toContain('blue');
+
+        inAnimation.runner.end();
+
+        expect(clonedAnchor).toHaveClass('red');
+        expect(clonedAnchor).toHaveClass('blue');
+      }));
+
+      it("should continue the anchor animation by seeding the to styles based on where the final anchor element will be positioned",
+      inject(function($rootElement, $$rAF) {
+        ss.addRule('.ending-element', 'width:9999px; height:6666px; display:inline-block;');
+
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+
+        var toAnchor = jqLite('<div class="ending-element"' +
+                                  ' style="margin-top:300px; margin-left:20px;"></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        captureLog.pop().runner.end();
+        $$rAF.flush();
+
+        var anchorAnimation = captureLog.pop();
+        var anchorElement = anchorAnimation.element;
+        var anchorDetails = anchorAnimation.args[1];
+
+        var toStyles = anchorDetails.to;
+        expect(int(toStyles.width)).toBe(9999);
+        expect(int(toStyles.height)).toBe(6666);
+        // some browsers have their own body margin defaults
+        expect(int(toStyles.top)).toBeGreaterThan(300);
+        expect(int(toStyles.left)).toBeGreaterThan(20);
+      }));
+
+      it("should remove the cloned anchor node from the DOM once the 'in' animation is complete",
+        inject(function($rootElement, $$rAF) {
+
+        var fromAnchor = jqLite('<div class="blue green red"></div>');
+        from.append(fromAnchor);
+        var toAnchor = jqLite('<div class="blue brown red black"></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start();
+
+        // the out animation goes first
+        var inAnimation = captureLog.pop();
+        var clonedAnchor = inAnimation.element;
+        expect(clonedAnchor.parent().length).toBe(1);
+        inAnimation.runner.end();
+        $$rAF.flush();
+
+        // now the in animation completes
+        expect(clonedAnchor.parent().length).toBe(1);
+        captureLog.pop().runner.end();
+
+        expect(clonedAnchor.parent().length).toBe(0);
+      }));
+
+      it("should pass the provided domOperation into $animateCss to be run right after the element is animated if a leave animation is present",
+        inject(function($rootElement, $$rAF) {
+
+        toAnimation.structural = true;
+        toAnimation.event = 'enter';
+        toAnimation.options = {};
+
+        fromAnimation.structural = true;
+        fromAnimation.event = 'leave';
+        fromAnimation.options = {};
+
+        var leaveOp = function() { };
+        fromAnimation.options.domOperation = leaveOp;
+
+        driver({
+          from: fromAnimation,
+          to: toAnimation
+        }).start();
+
+        var leaveAnimation = captureLog.shift();
+        var enterAnimation = captureLog.shift();
+
+        expect(leaveAnimation.args[1].onDone).toBe(leaveOp);
+        expect(enterAnimation.args[1].onDone).toBeUndefined();
+      }));
+
+      it("should fire the returned runner promise when the from, to and anchor animations are all complete",
+        inject(function($rootElement, $rootScope, $$rAF) {
+
+        ss.addRule('.ending-element', 'width:9999px; height:6666px; display:inline-block;');
+
+        var fromAnchor = jqLite('<div></div>');
+        from.append(fromAnchor);
+
+        var toAnchor = jqLite('<div></div>');
+        to.append(toAnchor);
+
+        $rootElement.append(fromAnchor);
+        $rootElement.append(toAnchor);
+
+        var completed = false;
+        driver({
+          from: fromAnimation,
+          to: toAnimation,
+          anchors: [{
+            'out': fromAnchor,
+            'in': toAnchor
+          }]
+        }).start().then(function() {
+          completed = true;
+        });
+
+        captureLog.pop().runner.end(); //from
+        captureLog.pop().runner.end(); //to
+        captureLog.pop().runner.end(); //anchor(out)
+        captureLog.pop().runner.end(); //anchor(in)
+        $$rAF.flush();
+        $rootScope.$digest();
+
+        expect(completed).toBe(true);
+      }));
+    });
+  });
+});
diff --git a/test/ngAnimate/animateCssSpec.js b/test/ngAnimate/animateCssSpec.js
new file mode 100644
index 000000000000..b83c77c5046b
--- /dev/null
+++ b/test/ngAnimate/animateCssSpec.js
@@ -0,0 +1,2705 @@
+'use strict';
+
+describe("ngAnimate $animateCss", function() {
+
+  beforeEach(module('ngAnimate'));
+
+  function assertAnimationRunning(element, not) {
+    var className = element.attr('class');
+    var regex = /\b\w+-active\b/;
+    not ? expect(className).toMatch(regex)
+        : expect(className).not.toMatch(regex);
+  }
+
+  var fakeStyle = {
+    color: 'blue'
+  };
+
+  var ss, prefix, triggerAnimationStartFrame;
+  beforeEach(module(function() {
+    return function($document, $window, $sniffer, $$rAF) {
+      prefix = '-' + $sniffer.vendorPrefix.toLowerCase() + '-';
+      ss = createMockStyleSheet($document, $window);
+      triggerAnimationStartFrame = function() {
+        $$rAF.flush();
+      };
+    };
+  }));
+
+  afterEach(function() {
+    if (ss) {
+      ss.destroy();
+    }
+  });
+
+  it("should return false if neither transitions or keyframes are supported by the browser",
+    inject(function($animateCss, $sniffer, $rootElement, $$body) {
+
+    var animator;
+    var element = jqLite('<div></div>');
+    $rootElement.append(element);
+    $$body.append($rootElement);
+
+    $sniffer.transitions = $sniffer.animations = false;
+    animator = $animateCss(element, {
+      duration: 10,
+      to: { 'background': 'red' }
+    });
+    expect(animator.$$willAnimate).toBeFalsy();
+  }));
+
+  describe('when active', function() {
+    if (!browserSupportsCssAnimations()) return;
+
+    it("should silently quit the animation and not throw when an element has no parent during preparation",
+      inject(function($animateCss, $$rAF, $rootScope, $document, $rootElement) {
+
+      var element = jqLite('<div></div>');
+      expect(function() {
+        $animateCss(element, {
+          duration: 1000,
+          event: 'fake',
+          to: fakeStyle
+        }).start();
+      }).not.toThrow();
+
+      expect(element).not.toHaveClass('fake');
+      triggerAnimationStartFrame();
+      expect(element).not.toHaveClass('fake-active');
+    }));
+
+    it("should silently quit the animation and not throw when an element has no parent before starting",
+      inject(function($animateCss, $$rAF, $rootScope, $document, $rootElement) {
+
+      var element = jqLite('<div></div>');
+      jqLite($document[0].body).append($rootElement);
+      $rootElement.append(element);
+
+      $animateCss(element, {
+        duration: 1000,
+        addClass: 'wait-for-it',
+        to: fakeStyle
+      }).start();
+
+      element.remove();
+
+      expect(function() {
+        triggerAnimationStartFrame();
+      }).not.toThrow();
+    }));
+
+    describe("rAF usage", function() {
+      it("should buffer all requests into a single requestAnimationFrame call",
+        inject(function($animateCss, $$rAF, $rootScope, $$body, $rootElement) {
+
+        $$body.append($rootElement);
+
+        var count = 0;
+        var runners = [];
+        function makeRequest() {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          var runner = $animateCss(element, { duration: 5, to: fakeStyle }).start();
+          runner.then(function() {
+            count++;
+          });
+          runners.push(runner);
+        }
+
+        makeRequest();
+        makeRequest();
+        makeRequest();
+
+        expect(count).toBe(0);
+
+        triggerAnimationStartFrame();
+        forEach(runners, function(runner) {
+          runner.end();
+        });
+
+        $rootScope.$digest();
+        expect(count).toBe(3);
+      }));
+
+      it("should cancel previous requests to rAF to avoid premature flushing", function() {
+        var count = 0;
+        module(function($provide) {
+          $provide.value('$$rAF', function() {
+            return function cancellationFn() {
+              count++;
+            };
+          });
+        });
+        inject(function($animateCss, $$rAF, $$body, $rootElement) {
+          $$body.append($rootElement);
+
+          function makeRequest() {
+            var element = jqLite('<div></div>');
+            $rootElement.append(element);
+            $animateCss(element, { duration: 5, to: fakeStyle }).start();
+          }
+
+          makeRequest();
+          makeRequest();
+          makeRequest();
+          expect(count).toBe(2);
+        });
+      });
+    });
+
+    describe("animator and runner", function() {
+      var animationDuration = 5;
+      var element, animator;
+      beforeEach(inject(function($animateCss, $rootElement, $$body) {
+        element = jqLite('<div></div>');
+        $rootElement.append(element);
+        $$body.append($rootElement);
+
+        animator = $animateCss(element, {
+          event: 'enter',
+          structural: true,
+          duration: animationDuration,
+          to: fakeStyle
+        });
+      }));
+
+      it('should expose start and end functions for the animator object', inject(function() {
+        expect(typeof animator.start).toBe('function');
+        expect(typeof animator.end).toBe('function');
+      }));
+
+      it('should expose end, cancel, resume and pause methods on the runner object', inject(function() {
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+
+        expect(typeof runner.end).toBe('function');
+        expect(typeof runner.cancel).toBe('function');
+        expect(typeof runner.resume).toBe('function');
+        expect(typeof runner.pause).toBe('function');
+      }));
+
+      it('should start the animation', inject(function() {
+        expect(element).not.toHaveClass('ng-enter-active');
+        animator.start();
+        triggerAnimationStartFrame();
+
+        expect(element).toHaveClass('ng-enter-active');
+      }));
+
+      it('should end the animation when called from the animator object', inject(function() {
+        animator.start();
+        triggerAnimationStartFrame();
+
+        animator.end();
+        expect(element).not.toHaveClass('ng-enter-active');
+      }));
+
+      it('should end the animation when called from the runner object', inject(function() {
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+        runner.end();
+        expect(element).not.toHaveClass('ng-enter-active');
+      }));
+
+      it('should permanently close the animation if closed before the next rAF runs', inject(function() {
+        var runner = animator.start();
+        runner.end();
+
+        triggerAnimationStartFrame();
+        expect(element).not.toHaveClass('ng-enter-active');
+      }));
+
+      it('should return a runner object at the start of the animation that contains a `then` method',
+        inject(function($rootScope) {
+
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+
+        expect(isPromiseLike(runner)).toBeTruthy();
+
+        var resolved;
+        runner.then(function() {
+          resolved = true;
+        });
+
+        runner.end();
+        $rootScope.$digest();
+        expect(resolved).toBeTruthy();
+      }));
+
+      it('should cancel the animation and reject', inject(function($rootScope) {
+        var rejected;
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+
+        runner.then(noop, function() {
+          rejected = true;
+        });
+
+        runner.cancel();
+        $rootScope.$digest();
+        expect(rejected).toBeTruthy();
+      }));
+
+      it('should run pause, but not effect the transition animation', inject(function() {
+        var blockingDelay = '-' + animationDuration + 's';
+
+        expect(element.css('transition-delay')).toEqual(blockingDelay);
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+
+        expect(element.css('transition-delay')).not.toEqual(blockingDelay);
+        runner.pause();
+        expect(element.css('transition-delay')).not.toEqual(blockingDelay);
+      }));
+
+      it('should pause the transition, have no effect, but not end it', inject(function() {
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+
+        runner.pause();
+
+        browserTrigger(element, 'transitionend',
+          { timeStamp: Date.now(), elapsedTime: 5 });
+
+        expect(element).toHaveClass('ng-enter-active');
+      }));
+
+      it('should resume the animation', inject(function() {
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+
+        runner.pause();
+
+        browserTrigger(element, 'transitionend',
+          { timeStamp: Date.now(), elapsedTime: 5 });
+
+        expect(element).toHaveClass('ng-enter-active');
+        runner.resume();
+
+        expect(element).not.toHaveClass('ng-enter-active');
+      }));
+
+      it('should pause and resume a keyframe animation using animation-play-state',
+        inject(function($animateCss) {
+
+        element.attr('style', '');
+        ss.addRule('.ng-enter', '-webkit-animation:1.5s keyframe_animation;' +
+                                        'animation:1.5s keyframe_animation;');
+
+        animator = $animateCss(element, {
+          event: 'enter',
+          structural: true
+        });
+
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+
+        runner.pause();
+        expect(element.css(prefix + 'animation-play-state')).toEqual('paused');
+        runner.resume();
+        expect(element.attr('style')).toBeFalsy();
+      }));
+
+      it('should remove the animation-play-state style if the animation is closed',
+        inject(function($animateCss) {
+
+        element.attr('style', '');
+        ss.addRule('.ng-enter', '-webkit-animation:1.5s keyframe_animation;' +
+                                        'animation:1.5s keyframe_animation;');
+
+        animator = $animateCss(element, {
+          event: 'enter',
+          structural: true
+        });
+
+        var runner = animator.start();
+        triggerAnimationStartFrame();
+
+        runner.pause();
+        expect(element.css(prefix + 'animation-play-state')).toEqual('paused');
+        runner.end();
+        expect(element.attr('style')).toBeFalsy();
+      }));
+    });
+
+    describe("CSS", function() {
+      describe("detected styles", function() {
+        var element, options;
+
+        function assertAnimationComplete(bool) {
+          var assert = expect(element);
+          if (bool) {
+            assert = assert.not;
+          }
+          assert.toHaveClass('ng-enter');
+          assert.toHaveClass('ng-enter-active');
+        }
+
+        function keyframeProgress(element, duration, delay) {
+          browserTrigger(element, 'animationend',
+            { timeStamp: Date.now() + ((delay || 1) * 1000), elapsedTime: duration });
+        }
+
+        function transitionProgress(element, duration, delay) {
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now() + ((delay || 1) * 1000), elapsedTime: duration });
+        }
+
+        beforeEach(inject(function($rootElement, $$body) {
+          element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+          options = { event: 'enter', structural: true };
+        }));
+
+        it("should always return an object even if no animation is detected",
+          inject(function($animateCss) {
+
+          ss.addRule('.some-animation', 'background:red;');
+
+          element.addClass('some-animation');
+          var animator = $animateCss(element, options);
+
+          expect(animator).toBeTruthy();
+          expect(isFunction(animator.start)).toBeTruthy();
+          expect(animator.end).toBeTruthy();
+          expect(animator.$$willAnimate).toBe(false);
+        }));
+
+        it("should close the animation immediately, but still return an animator object if no animation is detected",
+          inject(function($animateCss) {
+
+          ss.addRule('.another-fake-animation', 'background:blue;');
+
+          element.addClass('another-fake-animation');
+          var animator = $animateCss(element, {
+            event: 'enter',
+            structural: true
+          });
+
+          expect(element).not.toHaveClass('ng-enter');
+          expect(isFunction(animator.start)).toBeTruthy();
+        }));
+
+        they("should close the animation, but still accept $prop callbacks if no animation is detected",
+          ['done', 'then'], function(method) {
+
+          inject(function($animateCss, $$rAF, $rootScope) {
+            ss.addRule('.the-third-fake-animation', 'background:green;');
+
+            element.addClass('another-fake-animation');
+            var animator = $animateCss(element, {
+              event: 'enter',
+              structural: true
+            });
+
+            var done = false;
+            animator.start()[method](function() {
+              done = true;
+            });
+
+            expect(done).toBe(false);
+            $$rAF.flush();
+            if (method === 'then') {
+              $rootScope.$digest();
+            }
+            expect(done).toBe(true);
+          });
+        });
+
+        they("should close the animation, but still accept recognize runner.$prop if no animation is detected",
+          ['done(cancel)', 'catch'], function(method) {
+
+          inject(function($animateCss, $$rAF, $rootScope) {
+            ss.addRule('.the-third-fake-animation', 'background:green;');
+
+            element.addClass('another-fake-animation');
+            var animator = $animateCss(element, {
+              event: 'enter',
+              structural: true
+            });
+
+            var cancelled = false;
+            var runner = animator.start();
+
+            if (method === 'catch') {
+              runner.catch(function() {
+                cancelled = true;
+              });
+            } else {
+              runner.done(function(status) {
+                cancelled = status === false;
+              });
+            }
+
+            expect(cancelled).toBe(false);
+            runner.cancel();
+
+            if (method === 'catch') {
+              $rootScope.$digest();
+            }
+            expect(cancelled).toBe(true);
+          });
+        });
+
+        it("should use the highest transition duration value detected in the CSS class", inject(function($animateCss) {
+          ss.addRule('.ng-enter', 'transition:1s linear all;' +
+                                  'transition-duration:10s, 15s, 20s;');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          transitionProgress(element, 10);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 15);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 20);
+          assertAnimationComplete(true);
+        }));
+
+        it("should use the highest transition delay value detected in the CSS class", inject(function($animateCss) {
+          ss.addRule('.ng-enter', 'transition:1s linear all;' +
+                                  'transition-delay:10s, 15s, 20s;');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          transitionProgress(element, 1, 10);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 1, 15);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 1, 20);
+          assertAnimationComplete(true);
+        }));
+
+        it("should only close when both the animation delay and duration have passed",
+          inject(function($animateCss) {
+
+          ss.addRule('.ng-enter', 'transition:10s 5s linear all;');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+          transitionProgress(element, 10, 2);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 9, 6);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 10, 5);
+          assertAnimationComplete(true);
+        }));
+
+        it("should use the highest keyframe duration value detected in the CSS class", inject(function($animateCss) {
+          ss.addRule('.ng-enter', 'animation:animation 1s, animation 2s, animation 3s;' +
+                          '-webkit-animation:animation 1s, animation 2s, animation 3s;');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          keyframeProgress(element, 1);
+          assertAnimationComplete(false);
+
+          keyframeProgress(element, 2);
+          assertAnimationComplete(false);
+
+          keyframeProgress(element, 3);
+          assertAnimationComplete(true);
+        }));
+
+        it("should use the highest keyframe delay value detected in the CSS class", inject(function($animateCss) {
+          ss.addRule('.ng-enter', 'animation:animation 1s 2s, animation 1s 10s, animation 1s 1000ms;' +
+                          '-webkit-animation:animation 1s 2s, animation 1s 10s, animation 1s 1000ms;');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          keyframeProgress(element, 1, 1);
+          assertAnimationComplete(false);
+
+          keyframeProgress(element, 1, 2);
+          assertAnimationComplete(false);
+
+          keyframeProgress(element, 1, 10);
+          assertAnimationComplete(true);
+        }));
+
+        it("should use the highest keyframe duration value detected in the CSS class with respect to the animation-iteration-count property", inject(function($animateCss) {
+          ss.addRule('.ng-enter',
+                    'animation:animation 1s 2s 3, animation 1s 10s 2, animation 1s 1000ms infinite;' +
+            '-webkit-animation:animation 1s 2s 3, animation 1s 10s 2, animation 1s 1000ms infinite;');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          keyframeProgress(element, 1, 1);
+          assertAnimationComplete(false);
+
+          keyframeProgress(element, 1, 2);
+          assertAnimationComplete(false);
+
+          keyframeProgress(element, 3, 10);
+          assertAnimationComplete(true);
+        }));
+
+        it("should use the highest duration value when both transitions and keyframes are used", inject(function($animateCss) {
+          ss.addRule('.ng-enter', 'transition:1s linear all;' +
+                                  'transition-duration:10s, 15s, 20s;' +
+                                  'animation:animation 1s, animation 2s, animation 3s 0s 7;' +
+                          '-webkit-animation:animation 1s, animation 2s, animation 3s 0s 7;');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          transitionProgress(element, 10);
+          keyframeProgress(element, 10);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 15);
+          keyframeProgress(element, 15);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 20);
+          keyframeProgress(element, 20);
+          assertAnimationComplete(false);
+
+          // 7 * 3 = 21
+          transitionProgress(element, 21);
+          keyframeProgress(element, 21);
+          assertAnimationComplete(true);
+        }));
+
+        it("should use the highest delay value when both transitions and keyframes are used", inject(function($animateCss) {
+          ss.addRule('.ng-enter', 'transition:1s linear all;' +
+                                  'transition-delay:10s, 15s, 20s;' +
+                                  'animation:animation 1s 2s, animation 1s 16s, animation 1s 19s;' +
+                          '-webkit-animation:animation 1s 2s, animation 1s 16s, animation 1s 19s;');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          transitionProgress(element, 1, 10);
+          keyframeProgress(element, 1, 10);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 1, 16);
+          keyframeProgress(element, 1, 16);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 1, 19);
+          keyframeProgress(element, 1, 19);
+          assertAnimationComplete(false);
+
+          transitionProgress(element, 1, 20);
+          keyframeProgress(element, 1, 20);
+          assertAnimationComplete(true);
+        }));
+      });
+
+      describe("staggering", function() {
+        it("should apply a stagger based when an active ng-EVENT-stagger class with a transition-delay is detected",
+          inject(function($animateCss, $$body, $rootElement, $timeout) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.ng-enter-stagger', 'transition-delay:0.2s');
+          ss.addRule('.ng-enter', 'transition:2s linear all');
+
+          var elements = [];
+          var i;
+          var elm;
+
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            elements.push(elm);
+            $rootElement.append(elm);
+
+            $animateCss(elm, { event: 'enter', structural: true }).start();
+            expect(elm).not.toHaveClass('ng-enter-stagger');
+            expect(elm).toHaveClass('ng-enter');
+          }
+
+          triggerAnimationStartFrame();
+
+          expect(elements[0]).toHaveClass('ng-enter-active');
+          for (i = 1; i < 5; i++) {
+            elm = elements[i];
+
+            expect(elm).not.toHaveClass('ng-enter-active');
+            $timeout.flush(200);
+            expect(elm).toHaveClass('ng-enter-active');
+
+            browserTrigger(elm, 'transitionend',
+              { timeStamp: Date.now() + 1000, elapsedTime: 2 });
+
+            expect(elm).not.toHaveClass('ng-enter');
+            expect(elm).not.toHaveClass('ng-enter-active');
+            expect(elm).not.toHaveClass('ng-enter-stagger');
+          }
+        }));
+
+        it("should apply a stagger based when for all provided addClass/removeClass CSS classes",
+          inject(function($animateCss, $$body, $rootElement, $timeout) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.red-add-stagger,' +
+                     '.blue-remove-stagger,' +
+                     '.green-add-stagger', 'transition-delay:0.2s');
+
+          ss.addRule('.red-add,' +
+                     '.blue-remove,' +
+                     '.green-add', 'transition:2s linear all');
+
+          var elements = [];
+          var i;
+          var elm;
+
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div class="blue"></div>');
+            elements.push(elm);
+            $rootElement.append(elm);
+
+            $animateCss(elm, {
+              addClass: 'red green',
+              removeClass: 'blue'
+            }).start();
+          }
+
+          triggerAnimationStartFrame();
+          for (i = 0; i < 5; i++) {
+            elm = elements[i];
+
+            expect(elm).not.toHaveClass('red-add-stagger');
+            expect(elm).not.toHaveClass('green-add-stagger');
+            expect(elm).not.toHaveClass('blue-remove-stagger');
+
+            expect(elm).toHaveClass('red-add');
+            expect(elm).toHaveClass('green-add');
+            expect(elm).toHaveClass('blue-remove');
+          }
+
+          expect(elements[0]).toHaveClass('red-add-active');
+          expect(elements[0]).toHaveClass('green-add-active');
+          expect(elements[0]).toHaveClass('blue-remove-active');
+          for (i = 1; i < 5; i++) {
+            elm = elements[i];
+
+            expect(elm).not.toHaveClass('red-add-active');
+            expect(elm).not.toHaveClass('green-add-active');
+            expect(elm).not.toHaveClass('blue-remove-active');
+
+            $timeout.flush(200);
+
+            expect(elm).toHaveClass('red-add-active');
+            expect(elm).toHaveClass('green-add-active');
+            expect(elm).toHaveClass('blue-remove-active');
+
+            browserTrigger(elm, 'transitionend',
+              { timeStamp: Date.now() + 1000, elapsedTime: 2 });
+
+            expect(elm).not.toHaveClass('red-add-active');
+            expect(elm).not.toHaveClass('green-add-active');
+            expect(elm).not.toHaveClass('blue-remove-active');
+
+            expect(elm).not.toHaveClass('red-add-stagger');
+            expect(elm).not.toHaveClass('green-add-stagger');
+            expect(elm).not.toHaveClass('blue-remove-stagger');
+          }
+        }));
+
+        it("should block the transition animation between start and animate when staggered",
+          inject(function($animateCss, $$body, $rootElement) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.ng-enter-stagger', 'transition-delay:0.2s');
+          ss.addRule('.ng-enter', 'transition:2s linear all;');
+
+          var element;
+          var i;
+          var elms = [];
+
+          for (i = 0; i < 5; i++) {
+            element = jqLite('<div class="transition-animation"></div>');
+            $rootElement.append(element);
+
+            $animateCss(element, { event: 'enter', structural: true }).start();
+            elms.push(element);
+          }
+
+          triggerAnimationStartFrame();
+          for (i = 0; i < 5; i++) {
+            element = elms[i];
+            if (i === 0) {
+              expect(element.attr('style')).toBeFalsy();
+            } else {
+              expect(element.css('transition-delay')).toContain('-2s');
+            }
+          }
+        }));
+
+        it("should block (pause) the keyframe animation between start and animate when staggered",
+          inject(function($animateCss, $$body, $rootElement) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.ng-enter-stagger', prefix + 'animation-delay:0.2s');
+          ss.addRule('.ng-enter', prefix + 'animation:my_animation 2s;');
+
+          var i, element, elements = [];
+          for (i = 0; i < 5; i++) {
+            element = jqLite('<div class="transition-animation"></div>');
+            $rootElement.append(element);
+
+            $animateCss(element, { event: 'enter', structural: true }).start();
+            elements.push(element);
+          }
+
+          triggerAnimationStartFrame();
+
+          for (i = 0; i < 5; i++) {
+            element = elements[i];
+            if (i === 0) { // the first element is always run right away
+              expect(element.attr('style')).toBeFalsy();
+            } else {
+              expect(element.css(prefix + 'animation-play-state')).toBe('paused');
+            }
+          }
+        }));
+
+        it("should not apply a stagger if the transition delay value is inherited from a earlier CSS class",
+          inject(function($animateCss, $$body, $rootElement) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.transition-animation', 'transition:2s 5s linear all;');
+
+          for (var i = 0; i < 5; i++) {
+            var element = jqLite('<div class="transition-animation"></div>');
+            $rootElement.append(element);
+
+            $animateCss(element, { event: 'enter', structural: true }).start();
+            triggerAnimationStartFrame();
+
+
+            expect(element).toHaveClass('ng-enter-active');
+          }
+        }));
+
+        it("should apply a stagger only if the transition duration value is zero when inherited from a earlier CSS class",
+          inject(function($animateCss, $$body, $rootElement) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.transition-animation', 'transition:2s 5s linear all;');
+          ss.addRule('.transition-animation.ng-enter-stagger',
+            'transition-duration:0s; transition-delay:0.2s;');
+
+          var element, i, elms = [];
+          for (i = 0; i < 5; i++) {
+            element = jqLite('<div class="transition-animation"></div>');
+            $rootElement.append(element);
+
+            elms.push(element);
+            $animateCss(element, { event: 'enter', structural: true }).start();
+          }
+
+          triggerAnimationStartFrame();
+          for (i = 1; i < 5; i++) {
+            element = elms[i];
+            expect(element).not.toHaveClass('ng-enter-active');
+          }
+        }));
+
+
+        it("should ignore animation staggers if only transition animations were detected",
+          inject(function($animateCss, $$body, $rootElement) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.ng-enter-stagger', prefix + 'animation-delay:0.2s');
+          ss.addRule('.transition-animation', 'transition:2s 5s linear all;');
+
+          for (var i = 0; i < 5; i++) {
+            var element = jqLite('<div class="transition-animation"></div>');
+            $rootElement.append(element);
+
+            $animateCss(element, { event: 'enter', structural: true }).start();
+            triggerAnimationStartFrame();
+
+
+            expect(element).toHaveClass('ng-enter-active');
+          }
+        }));
+
+        it("should ignore transition staggers if only keyframe animations were detected",
+          inject(function($animateCss, $$body, $rootElement) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.ng-enter-stagger', 'transition-delay:0.2s');
+          ss.addRule('.transition-animation', prefix + 'animation:2s 5s my_animation;');
+
+          for (var i = 0; i < 5; i++) {
+            var elm = jqLite('<div class="transition-animation"></div>');
+            $rootElement.append(elm);
+
+            var animator = $animateCss(elm, { event: 'enter', structural: true }).start();
+            triggerAnimationStartFrame();
+
+
+            expect(elm).toHaveClass('ng-enter-active');
+          }
+        }));
+
+        it("should start on the highest stagger value if both transition and keyframe staggers are used together",
+          inject(function($animateCss, $$body, $rootElement, $timeout, $browser) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.ng-enter-stagger', 'transition-delay:0.5s;' +
+                                 prefix + 'animation-delay:1s');
+
+          ss.addRule('.ng-enter', 'transition:10s linear all;' +
+                         prefix + 'animation:my_animation 20s');
+
+          var i, elm, elements = [];
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            elements.push(elm);
+            $rootElement.append(elm);
+
+            $animateCss(elm, { event: 'enter', structural: true }).start();
+
+            expect(elm).toHaveClass('ng-enter');
+          }
+
+          triggerAnimationStartFrame();
+
+          expect(elements[0]).toHaveClass('ng-enter-active');
+          for (i = 1; i < 5; i++) {
+            elm = elements[i];
+
+            expect(elm).not.toHaveClass('ng-enter-active');
+
+            $timeout.flush(500);
+            expect(elm).not.toHaveClass('ng-enter-active');
+
+            $timeout.flush(500);
+            expect(elm).toHaveClass('ng-enter-active');
+          }
+        }));
+
+        it("should apply the closing timeout ontop of the stagger timeout",
+          inject(function($animateCss, $$body, $rootElement, $timeout, $browser) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.ng-enter-stagger', 'transition-delay:1s;');
+          ss.addRule('.ng-enter', 'transition:10s linear all;');
+
+          var elm, i, elms = [];
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            elms.push(elm);
+            $rootElement.append(elm);
+
+            $animateCss(elm, { event: 'enter', structural: true }).start();
+            triggerAnimationStartFrame();
+          }
+
+          for (i = 1; i < 2; i++) {
+            elm = elms[i];
+            expect(elm).toHaveClass('ng-enter');
+            $timeout.flush(1000);
+            $timeout.flush(15000);
+            expect(elm).not.toHaveClass('ng-enter');
+          }
+        }));
+
+        it("should apply the closing timeout ontop of the stagger timeout with an added delay",
+          inject(function($animateCss, $$body, $rootElement, $timeout, $browser) {
+
+          $$body.append($rootElement);
+
+          ss.addRule('.ng-enter-stagger', 'transition-delay:1s;');
+          ss.addRule('.ng-enter', 'transition:10s linear all; transition-delay:50s;');
+
+          var elm, i, elms = [];
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            elms.push(elm);
+            $rootElement.append(elm);
+
+            $animateCss(elm, { event: 'enter', structural: true }).start();
+            triggerAnimationStartFrame();
+          }
+
+          for (i = 1; i < 2; i++) {
+            elm = elms[i];
+            expect(elm).toHaveClass('ng-enter');
+            $timeout.flush(1000);
+            $timeout.flush(65000);
+            expect(elm).not.toHaveClass('ng-enter');
+          }
+        }));
+
+        it("should issue a stagger if a stagger value is provided in the options",
+          inject(function($animateCss, $$body, $rootElement, $timeout) {
+
+          $$body.append($rootElement);
+          ss.addRule('.ng-enter', 'transition:2s linear all');
+
+          var elm, i, elements = [];
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            elements.push(elm);
+            $rootElement.append(elm);
+
+            $animateCss(elm, {
+              event: 'enter',
+              structural: true,
+              stagger: 0.5
+            }).start();
+            expect(elm).toHaveClass('ng-enter');
+          }
+
+          triggerAnimationStartFrame();
+
+          expect(elements[0]).toHaveClass('ng-enter-active');
+          for (i = 1; i < 5; i++) {
+            elm = elements[i];
+
+            expect(elm).not.toHaveClass('ng-enter-active');
+            $timeout.flush(500);
+            expect(elm).toHaveClass('ng-enter-active');
+
+            browserTrigger(elm, 'transitionend',
+              { timeStamp: Date.now() + 1000, elapsedTime: 2 });
+
+            expect(elm).not.toHaveClass('ng-enter');
+            expect(elm).not.toHaveClass('ng-enter-active');
+            expect(elm).not.toHaveClass('ng-enter-stagger');
+          }
+        }));
+
+        it("should only add/remove classes once the stagger timeout has passed",
+          inject(function($animateCss, $$body, $rootElement, $timeout) {
+
+          $$body.append($rootElement);
+
+          var element = jqLite('<div class="green"></div>');
+          $rootElement.append(element);
+
+          $animateCss(element, {
+            addClass: 'red',
+            removeClass: 'green',
+            duration: 5,
+            stagger: 0.5,
+            staggerIndex: 3
+          }).start();
+
+          triggerAnimationStartFrame();
+          expect(element).toHaveClass('green');
+          expect(element).not.toHaveClass('red');
+
+          $timeout.flush(1500);
+          expect(element).not.toHaveClass('green');
+          expect(element).toHaveClass('red');
+        }));
+      });
+
+      describe("closing timeout", function() {
+        it("should close off the animation after 150% of the animation time has passed",
+          inject(function($animateCss, $$body, $rootElement, $timeout) {
+
+          ss.addRule('.ng-enter', 'transition:10s linear all;');
+
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var animator = $animateCss(element, { event: 'enter', structural: true });
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element).toHaveClass('ng-enter');
+          expect(element).toHaveClass('ng-enter-active');
+
+          $timeout.flush(15000);
+
+          expect(element).not.toHaveClass('ng-enter');
+          expect(element).not.toHaveClass('ng-enter-active');
+        }));
+
+        it("should close off the animation after 150% of the animation time has passed and consider the detected delay value",
+          inject(function($animateCss, $$body, $rootElement, $timeout) {
+
+          ss.addRule('.ng-enter', 'transition:10s linear all; transition-delay:30s;');
+
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var animator = $animateCss(element, { event: 'enter', structural: true });
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element).toHaveClass('ng-enter');
+          expect(element).toHaveClass('ng-enter-active');
+
+          $timeout.flush(45000);
+
+          expect(element).not.toHaveClass('ng-enter');
+          expect(element).not.toHaveClass('ng-enter-active');
+        }));
+
+        it("should still resolve the animation once expired",
+          inject(function($animateCss, $$body, $rootElement, $timeout) {
+
+          ss.addRule('.ng-enter', 'transition:10s linear all;');
+
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var animator = $animateCss(element, { event: 'enter', structural: true });
+
+          var failed, passed;
+          animator.start().then(function() {
+              passed = true;
+            }, function() {
+              failed = true;
+            });
+
+          triggerAnimationStartFrame();
+          $timeout.flush(15000);
+          expect(passed).toBe(true);
+        }));
+
+        it("should not resolve/reject after passing if the animation completed successfully",
+          inject(function($animateCss, $$body, $rootElement, $timeout, $rootScope) {
+
+          ss.addRule('.ng-enter', 'transition:10s linear all;');
+
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var animator = $animateCss(element, { event: 'enter', structural: true });
+
+          var failed, passed;
+          animator.start().then(
+            function() {
+              passed = true;
+            },
+            function() {
+              failed = true;
+            }
+          );
+          triggerAnimationStartFrame();
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now() + 1000, elapsedTime: 10 });
+
+          $rootScope.$digest();
+
+          expect(passed).toBe(true);
+          expect(failed).not.toBe(true);
+
+          $timeout.flush(15000);
+
+          expect(passed).toBe(true);
+          expect(failed).not.toBe(true);
+        }));
+      });
+
+      describe("getComputedStyle", function() {
+        var count;
+        var acceptableTimingsData = {
+          transitionDuration: "10s"
+        };
+
+        beforeEach(module(function($provide) {
+          count = {};
+          $provide.value('$window', extend({}, window, {
+            document: jqLite(window.document),
+            getComputedStyle: function(node) {
+              var key = node.className.indexOf('stagger') >= 0
+                  ? 'stagger' : 'normal';
+              count[key] = count[key] || 0;
+              count[key]++;
+              return acceptableTimingsData;
+            }
+          }));
+
+          return function($$body, $rootElement) {
+            $$body.append($rootElement);
+          };
+        }));
+
+        it("should cache frequent calls to getComputedStyle before the next animation frame kicks in",
+          inject(function($animateCss, $document, $rootElement, $$rAF) {
+
+          var i, elm, animator;
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            $rootElement.append(elm);
+            animator = $animateCss(elm, { event: 'enter', structural: true });
+            var runner = animator.start();
+          }
+
+          expect(count.normal).toBe(1);
+
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            $rootElement.append(elm);
+            animator = $animateCss(elm, { event: 'enter', structural: true });
+            animator.start();
+          }
+
+          expect(count.normal).toBe(1);
+          triggerAnimationStartFrame();
+
+          expect(count.normal).toBe(2);
+
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            $rootElement.append(elm);
+            animator = $animateCss(elm, { event: 'enter', structural: true });
+            animator.start();
+          }
+
+          expect(count.normal).toBe(3);
+        }));
+
+        it("should cache frequent calls to getComputedStyle for stagger animations before the next animation frame kicks in",
+          inject(function($animateCss, $document, $rootElement, $$rAF) {
+
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          var animator = $animateCss(element, { event: 'enter', structural: true });
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(count.stagger).toBeUndefined();
+
+          var i, elm;
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            $rootElement.append(elm);
+            animator = $animateCss(elm, { event: 'enter', structural: true });
+            animator.start();
+          }
+
+          expect(count.stagger).toBe(1);
+
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            $rootElement.append(elm);
+            animator = $animateCss(elm, { event: 'enter', structural: true });
+            animator.start();
+          }
+
+          expect(count.stagger).toBe(1);
+          $$rAF.flush();
+
+          for (i = 0; i < 5; i++) {
+            elm = jqLite('<div></div>');
+            $rootElement.append(elm);
+            animator = $animateCss(elm, { event: 'enter', structural: true });
+            animator.start();
+          }
+
+          triggerAnimationStartFrame();
+          expect(count.stagger).toBe(2);
+        }));
+      });
+    });
+
+    it('should avoid applying the same cache to an element a follow-up animation is run on the same element',
+      inject(function($animateCss, $rootElement, $$body) {
+
+      function endTransition(element, elapsedTime) {
+        browserTrigger(element, 'transitionend',
+          { timeStamp: Date.now(), elapsedTime: elapsedTime });
+      }
+
+      function startAnimation(element, duration, color) {
+        $animateCss(element, {
+          duration: duration,
+          to: { background: color }
+        }).start();
+        triggerAnimationStartFrame();
+      }
+
+      var element = jqLite('<div></div>');
+      $rootElement.append(element);
+      $$body.append($rootElement);
+
+      startAnimation(element, 0.5, 'red');
+      expect(element.attr('style')).toContain('transition');
+
+      endTransition(element, 0.5);
+      expect(element.attr('style')).not.toContain('transition');
+
+      startAnimation(element, 0.8, 'blue');
+      expect(element.attr('style')).toContain('transition');
+
+      // Trigger an extra transitionend event that matches the original transition
+      endTransition(element, 0.5);
+      expect(element.attr('style')).toContain('transition');
+
+      endTransition(element, 0.8);
+      expect(element.attr('style')).not.toContain('transition');
+    }));
+
+    it('should apply a custom temporary class when a non-structural animation is used',
+      inject(function($animateCss, $rootElement, $$body) {
+
+      var element = jqLite('<div></div>');
+      $rootElement.append(element);
+      $$body.append($rootElement);
+
+      $animateCss(element, {
+        event: 'super',
+        duration: 1000,
+        to: fakeStyle
+      }).start();
+      expect(element).toHaveClass('super');
+
+      triggerAnimationStartFrame();
+      expect(element).toHaveClass('super-active');
+    }));
+
+    describe("structural animations", function() {
+      they('should decorate the element with the ng-$prop CSS class',
+        ['enter', 'leave', 'move'], function(event) {
+        inject(function($animateCss, $rootElement, $$body) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          $animateCss(element, {
+            event: event,
+            structural: true,
+            duration: 1000,
+            to: fakeStyle
+          });
+          expect(element).toHaveClass('ng-' + event);
+        });
+      });
+
+      they('should decorate the element with the ng-$prop-active CSS class',
+        ['enter', 'leave', 'move'], function(event) {
+        inject(function($animateCss, $rootElement, $$body) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var animator = $animateCss(element, {
+            event: event,
+            structural: true,
+            duration: 1000,
+            to: fakeStyle
+          });
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element).toHaveClass('ng-' + event + '-active');
+        });
+      });
+
+      they('should remove the ng-$prop and ng-$prop-active CSS classes from the element once the animation is done',
+        ['enter', 'leave', 'move'], function(event) {
+        inject(function($animateCss, $rootElement, $$body) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var animator = $animateCss(element, {
+            event: event,
+            structural: true,
+            duration: 1,
+            to: fakeStyle
+          });
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now() + 1000, elapsedTime: 1 });
+
+          expect(element).not.toHaveClass('ng-' + event);
+          expect(element).not.toHaveClass('ng-' + event + '-active');
+        });
+      });
+
+      they('should allow additional CSS classes to be added and removed alongside the $prop animation',
+        ['enter', 'leave', 'move'], function(event) {
+        inject(function($animateCss, $rootElement) {
+          var element = jqLite('<div class="green"></div>');
+          $rootElement.append(element);
+          var animator = $animateCss(element, {
+            event: event,
+            structural: true,
+            duration: 1,
+            to: fakeStyle,
+            addClass: 'red',
+            removeClass: 'green'
+          });
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element).toHaveClass('ng-' + event);
+          expect(element).toHaveClass('ng-' + event + '-active');
+
+          expect(element).toHaveClass('red');
+          expect(element).toHaveClass('red-add');
+          expect(element).toHaveClass('red-add-active');
+
+          expect(element).not.toHaveClass('green');
+          expect(element).toHaveClass('green-remove');
+          expect(element).toHaveClass('green-remove-active');
+        });
+      });
+
+      they('should place a CSS transition block after the preparation function to block accidental style changes',
+        ['enter', 'leave', 'move', 'addClass', 'removeClass'], function(event) {
+
+        inject(function($animateCss, $rootElement, $$body) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          ss.addRule('.cool-animation', 'transition:1.5s linear all;');
+          element.addClass('cool-animation');
+
+          var data = {};
+          if (event === 'addClass') {
+            data.addClass = 'green';
+          } else if (event === 'removeClass') {
+            element.addClass('red');
+            data.removeClass = 'red';
+          } else {
+            data.event = event;
+          }
+
+          var animator = $animateCss(element, data);
+          expect(element.css('transition-delay')).toMatch('-1.5s');
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element.attr('style')).toBeFalsy();
+        });
+      });
+
+      they('should not place a CSS transition block if options.skipBlocking is provided',
+        ['enter', 'leave', 'move', 'addClass', 'removeClass'], function(event) {
+
+        inject(function($animateCss, $rootElement, $$body, $window) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          ss.addRule('.cool-animation', 'transition:1.5s linear all;');
+          element.addClass('cool-animation');
+
+          var data = {};
+          if (event === 'addClass') {
+            data.addClass = 'green';
+          } else if (event === 'removeClass') {
+            element.addClass('red');
+            data.removeClass = 'red';
+          } else {
+            data.event = event;
+          }
+
+          var blockSpy = spyOn($window, 'blockTransitions').andCallThrough();
+
+          data.skipBlocking = true;
+          var animator = $animateCss(element, data);
+
+          expect(blockSpy).not.toHaveBeenCalled();
+
+          expect(element.attr('style')).toBeFalsy();
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element.attr('style')).toBeFalsy();
+
+          // just to prove it works
+          data.skipBlocking = false;
+          $animateCss(element, { addClass: 'test' });
+          expect(blockSpy).toHaveBeenCalled();
+        });
+      });
+
+      they('should place a CSS transition block after the preparation function even if a duration is provided',
+        ['enter', 'leave', 'move', 'addClass', 'removeClass'], function(event) {
+
+        inject(function($animateCss, $rootElement, $$body) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          ss.addRule('.cool-animation', 'transition:1.5s linear all;');
+          element.addClass('cool-animation');
+
+          var data = {};
+          if (event === 'addClass') {
+            data.addClass = 'green';
+          } else if (event === 'removeClass') {
+            element.addClass('red');
+            data.removeClass = 'red';
+          } else {
+            data.event = event;
+          }
+
+          data.duration = 10;
+          var animator = $animateCss(element, data);
+
+          expect(element.css('transition-delay')).toMatch('-10s');
+          expect(element.css('transition-duration')).toMatch('');
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element.attr('style')).not.toContain('transition-delay');
+          expect(element.css('transition-property')).toContain('all');
+          expect(element.css('transition-duration')).toContain('10s');
+        });
+      });
+
+      it('should allow multiple events to be animated at the same time',
+        inject(function($animateCss, $rootElement, $$body) {
+
+        var element = jqLite('<div></div>');
+        $rootElement.append(element);
+        $$body.append($rootElement);
+
+        $animateCss(element, {
+          event: ['enter', 'leave', 'move'],
+          structural: true,
+          duration: 1,
+          to: fakeStyle
+        }).start();
+        triggerAnimationStartFrame();
+
+
+        expect(element).toHaveClass('ng-enter');
+        expect(element).toHaveClass('ng-leave');
+        expect(element).toHaveClass('ng-move');
+
+        expect(element).toHaveClass('ng-enter-active');
+        expect(element).toHaveClass('ng-leave-active');
+        expect(element).toHaveClass('ng-move-active');
+
+        browserTrigger(element, 'transitionend',
+          { timeStamp: Date.now() + 1000, elapsedTime: 1 });
+
+        expect(element).not.toHaveClass('ng-enter');
+        expect(element).not.toHaveClass('ng-leave');
+        expect(element).not.toHaveClass('ng-move');
+        expect(element).not.toHaveClass('ng-enter-active');
+        expect(element).not.toHaveClass('ng-leave-active');
+        expect(element).not.toHaveClass('ng-move-active');
+      }));
+    });
+
+    describe("class-based animations", function() {
+      they('should decorate the element with the class-$prop CSS class',
+        ['add', 'remove'], function(event) {
+        inject(function($animateCss, $rootElement) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+
+          var options = {};
+          options[event + 'Class'] = 'class';
+          options.duration = 1000;
+          options.to = fakeStyle;
+          $animateCss(element, options);
+          expect(element).toHaveClass('class-' + event);
+        });
+      });
+
+      they('should decorate the element with the class-$prop-active CSS class',
+        ['add', 'remove'], function(event) {
+        inject(function($animateCss, $rootElement) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+
+          var options = {};
+          options[event + 'Class'] = 'class';
+          options.duration = 1000;
+          options.to = fakeStyle;
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element).toHaveClass('class-' + event + '-active');
+        });
+      });
+
+      they('should remove the class-$prop-add and class-$prop-active CSS classes from the element once the animation is done',
+        ['enter', 'leave', 'move'], function(event) {
+        inject(function($animateCss, $rootElement, $$body) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var options = {};
+          options.event = event;
+          options.duration = 10;
+          options.to = fakeStyle;
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now() + 1000, elapsedTime: 10 });
+
+          expect(element).not.toHaveClass('ng-' + event);
+          expect(element).not.toHaveClass('ng-' + event + '-active');
+        });
+      });
+
+      they('should allow the class duration styles to be recalculated once started if the CSS classes being applied result new transition styles',
+        ['add', 'remove'], function(event) {
+        inject(function($animateCss, $rootElement, $$body) {
+
+          var element = jqLite('<div></div>');
+
+          if (event == 'add') {
+            ss.addRule('.natural-class', 'transition:1s linear all;');
+          } else {
+            ss.addRule('.natural-class', 'transition:0s linear none;');
+            ss.addRule('.base-class', 'transition:1s linear none;');
+
+            element.addClass('base-class');
+            element.addClass('natural-class');
+          }
+
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var options = {};
+          options[event + 'Class'] = 'natural-class';
+          var runner = $animateCss(element, options);
+          runner.start();
+          triggerAnimationStartFrame();
+
+          expect(element).toHaveClass('natural-class-' + event);
+          expect(element).toHaveClass('natural-class-' + event + '-active');
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now(), elapsedTime: 1 });
+
+          expect(element).not.toHaveClass('natural-class-' + event);
+          expect(element).not.toHaveClass('natural-class-' + event + '-active');
+        });
+      });
+
+      they('should force the class-based values to be applied early if no options.applyClassEarly is used as an option',
+        ['enter', 'leave', 'move'], function(event) {
+        inject(function($animateCss, $rootElement, $$body) {
+
+          ss.addRule('.blue.ng-' + event, 'transition:2s linear all;');
+
+          var element = jqLite('<div class="red"></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+
+          var runner = $animateCss(element, {
+            addClass: 'blue',
+            applyClassesEarly: true,
+            removeClass: 'red',
+            event: event,
+            structural: true
+          });
+
+          runner.start();
+          expect(element).toHaveClass('ng-' + event);
+          expect(element).toHaveClass('blue');
+          expect(element).not.toHaveClass('red');
+
+          triggerAnimationStartFrame();
+          expect(element).toHaveClass('ng-' + event);
+          expect(element).toHaveClass('ng-' + event + '-active');
+          expect(element).toHaveClass('blue');
+          expect(element).not.toHaveClass('red');
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now(), elapsedTime: 2 });
+
+          expect(element).not.toHaveClass('ng-' + event);
+          expect(element).not.toHaveClass('ng-' + event + '-active');
+          expect(element).toHaveClass('blue');
+          expect(element).not.toHaveClass('red');
+        });
+      });
+    });
+
+    describe("options", function() {
+      var element;
+      beforeEach(inject(function($rootElement, $$body) {
+        $$body.append($rootElement);
+
+        element = jqLite('<div></div>');
+        $rootElement.append(element);
+      }));
+
+      describe("[$$skipPreparationClasses]", function() {
+        it('should not apply and remove the preparation classes to the element when true',
+          inject(function($animateCss) {
+
+          var options = {
+            duration: 3000,
+            to: fakeStyle,
+            event: 'event',
+            structural: true,
+            addClass: 'klass',
+            $$skipPreparationClasses: true
+          };
+
+          var animator = $animateCss(element, options);
+
+          expect(element).not.toHaveClass('klass-add');
+          expect(element).not.toHaveClass('ng-event');
+
+          var runner = animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element).not.toHaveClass('klass-add');
+          expect(element).not.toHaveClass('ng-event');
+
+          expect(element).toHaveClass('klass-add-active');
+          expect(element).toHaveClass('ng-event-active');
+
+          element.addClass('klass-add ng-event');
+
+          runner.end();
+
+          expect(element).toHaveClass('klass-add');
+          expect(element).toHaveClass('ng-event');
+
+          expect(element).not.toHaveClass('klass-add-active');
+          expect(element).not.toHaveClass('ng-event-active');
+        }));
+      });
+
+      describe("[duration]", function() {
+        it("should be applied for a transition directly", inject(function($animateCss, $rootElement) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+
+          var options = {
+            duration: 3000,
+            to: fakeStyle,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+          var style = element.attr('style');
+          expect(style).toContain('3000s');
+          expect(style).toContain('linear');
+        }));
+
+        it("should be applied to a CSS keyframe animation directly if keyframes are detected within the CSS class",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-animation:1.5s keyframe_animation;' +
+                                          'animation:1.5s keyframe_animation;');
+
+          var options = {
+            duration: 5,
+            event: 'enter',
+            structural: true
+          };
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element.css(prefix + 'animation-duration')).toEqual('5s');
+        }));
+
+        it("should remove all inline keyframe styling when an animation completes if a custom duration was applied",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-animation:1.5s keyframe_animation;' +
+                                          'animation:1.5s keyframe_animation;');
+
+          var options = {
+            duration: 5,
+            event: 'enter',
+            structural: true
+          };
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          browserTrigger(element, 'animationend',
+            { timeStamp: Date.now() + 5000, elapsedTime: 5 });
+
+          expect(element.attr('style')).toBeFalsy();
+        }));
+
+        it("should remove all inline keyframe delay styling when an animation completes if a custom duration was applied",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-animation:1.5s keyframe_animation;' +
+                                          'animation:1.5s keyframe_animation;');
+
+          var options = {
+            delay: 5,
+            event: 'enter',
+            structural: true
+          };
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element.css(prefix + 'animation-delay')).toEqual('5s');
+
+          browserTrigger(element, 'animationend',
+            { timeStamp: Date.now() + 5000, elapsedTime: 1.5 });
+
+          expect(element.attr('style')).toBeFalsy();
+        }));
+
+        it("should not prepare the animation at all if a duration of zero is provided",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-transition:1s linear all;' +
+                                          'transition:1s linear all;');
+
+          var options = {
+            duration: 0,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+
+          expect(animator.$$willAnimate).toBeFalsy();
+        }));
+
+        it("should apply a transition and keyframe duration directly if both transitions and keyframe classes are detected",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-animation:3s keyframe_animation;' +
+                                          'animation:3s keyframe_animation;' +
+                                          'transition:5s linear all;');
+
+          var options = {
+            duration: 4,
+            event: 'enter',
+            structural: true
+          };
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          var style = element.attr('style');
+          expect(style).toMatch(/animation(?:-duration)?:\s*4s/);
+          expect(element.css('transition-duration')).toMatch('4s');
+          expect(element.css('transition-property')).toMatch('all');
+          expect(style).toContain('linear');
+        }));
+      });
+
+      describe("[delay]", function() {
+        it("should be applied for a transition directly", inject(function($animateCss, $rootElement) {
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+
+          var options = {
+            duration: 3000,
+            delay: 500,
+            to: fakeStyle,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var prop = element.css('transition-delay');
+          expect(prop).toEqual('500s');
+        }));
+
+        it("should return false for the animator if a delay is provided but not a duration",
+          inject(function($animateCss, $rootElement) {
+
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+
+          var options = {
+            delay: 500,
+            to: fakeStyle,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+          expect(animator.$$willAnimate).toBeFalsy();
+        }));
+
+        it("should override the delay value present in the CSS class",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-transition:1s linear all;' +
+                                          'transition:1s linear all;' +
+                                  '-webkit-transition-delay:10s;' +
+                                          'transition-delay:10s;');
+
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+
+          var options = {
+            delay: 500,
+            event: 'enter',
+            structural: true
+          };
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var prop = element.css('transition-delay');
+          expect(prop).toEqual('500s');
+        }));
+
+        it("should allow the delay value to zero if provided",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-transition:1s linear all;' +
+                                          'transition:1s linear all;' +
+                                  '-webkit-transition-delay:10s;' +
+                                          'transition-delay:10s;');
+
+          var element = jqLite('<div></div>');
+          $rootElement.append(element);
+
+          var options = {
+            delay: 0,
+            event: 'enter',
+            structural: true
+          };
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var prop = element.css('transition-delay');
+          expect(prop).toEqual('0s');
+        }));
+
+        it("should be applied to a CSS keyframe animation if detected within the CSS class",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-animation:1.5s keyframe_animation;' +
+                                          'animation:1.5s keyframe_animation;');
+
+          var options = {
+            delay: 400,
+            event: 'enter',
+            structural: true
+          };
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element.css(prefix + 'animation-delay')).toEqual('400s');
+          expect(element.attr('style')).not.toContain('transition-delay');
+        }));
+
+        it("should apply a transition and keyframe delay if both transitions and keyframe classes are detected",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-animation:3s keyframe_animation;' +
+                                          'animation:3s keyframe_animation;' +
+                                          'transition:5s linear all;');
+
+          var options = {
+            delay: 10,
+            event: 'enter',
+            structural: true
+          };
+          var animator = $animateCss(element, options);
+
+          expect(element.css('transition-delay')).toContain('-5s');
+          expect(element.attr('style')).not.toContain('animation-delay');
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element.css(prefix + 'animation-delay')).toEqual('10s');
+          expect(element.css('transition-delay')).toEqual('10s');
+        }));
+
+        it("should apply blocking before the animation starts, but then apply the detected delay when options.delay is true",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', 'transition:2s linear all; transition-delay: 1s;');
+
+          var options = {
+            delay: true,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+          expect(element.css('transition-delay')).toEqual('-2s');
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element.css('transition-delay')).toEqual('1s');
+        }));
+
+        they("should consider a negative value when delay:true is used with a $prop animation", {
+          'transition': function() {
+            return {
+              prop: 'transition-delay',
+              css: 'transition:2s linear all; transition-delay: -1s'
+            };
+          },
+          'keyframe': function(prefix) {
+            return {
+              prop: prefix + 'animation-delay',
+              css: prefix + 'animation:2s keyframe_animation; ' + prefix + 'animation-delay: -1s;'
+            };
+          }
+        }, function(testDetailsFactory) {
+          inject(function($animateCss, $rootElement) {
+            var testDetails = testDetailsFactory(prefix);
+
+            ss.addRule('.ng-enter', testDetails.css);
+            var options = {
+              delay: true,
+              event: 'enter',
+              structural: true
+            };
+
+            var animator = $animateCss(element, options);
+
+            animator.start();
+            triggerAnimationStartFrame();
+
+            expect(element.css(testDetails.prop)).toContain('-1s');
+          });
+        });
+
+        they("should consider a negative value when a negative option delay is provided for a $prop animation", {
+          'transition': function() {
+            return {
+              prop: 'transition-delay',
+              css: 'transition:2s linear all'
+            };
+          },
+          'keyframe': function(prefix) {
+            return {
+              prop: prefix + 'animation-delay',
+              css: prefix + 'animation:2s keyframe_animation'
+            };
+          }
+        }, function(testDetailsFactory) {
+          inject(function($animateCss, $rootElement) {
+            var testDetails = testDetailsFactory(prefix);
+
+            ss.addRule('.ng-enter', testDetails.css);
+            var options = {
+              delay: -2,
+              event: 'enter',
+              structural: true
+            };
+
+            var animator = $animateCss(element, options);
+
+            animator.start();
+            triggerAnimationStartFrame();
+
+            expect(element.css(testDetails.prop)).toContain('-2s');
+          });
+        });
+
+        they("should expect the $propend event to always return the full duration even when negative values are used", {
+          'transition': function() {
+            return {
+              event: 'transitionend',
+              css: 'transition:5s linear all; transition-delay: -2s'
+            };
+          },
+          'animation': function(prefix) {
+            return {
+              event: 'animationend',
+              css: prefix + 'animation:5s keyframe_animation; ' + prefix + 'animation-delay: -2s;'
+            };
+          }
+        }, function(testDetailsFactory) {
+          inject(function($animateCss, $rootElement) {
+            var testDetails = testDetailsFactory(prefix);
+            var event = testDetails.event;
+
+            ss.addRule('.ng-enter', testDetails.css);
+            var options = { event: 'enter', structural: true };
+
+            var animator = $animateCss(element, options);
+            animator.start();
+            triggerAnimationStartFrame();
+
+            // 5 + (-2s) = 3
+            browserTrigger(element, event, { timeStamp: Date.now(), elapsedTime: 3 });
+
+            assertAnimationRunning(element, true);
+
+            // 5 seconds is the full animation
+            browserTrigger(element, event, { timeStamp: Date.now(), elapsedTime: 5 });
+
+            assertAnimationRunning(element);
+          });
+        });
+      });
+
+      describe("[transitionStyle]", function() {
+        it("should apply the transition directly onto the element and animate accordingly",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            transitionStyle: '5.5s linear all',
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var style = element.attr('style');
+          expect(element.css('transition-duration')).toMatch('5.5s');
+          expect(element.css('transition-property')).toMatch('all');
+          expect(style).toContain('linear');
+
+          expect(element).toHaveClass('ng-enter');
+          expect(element).toHaveClass('ng-enter-active');
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now() + 10000, elapsedTime: 5.5 });
+
+          expect(element).not.toHaveClass('ng-enter');
+          expect(element).not.toHaveClass('ng-enter-active');
+
+          expect(element.attr('style')).toBeFalsy();
+        }));
+
+        it("should give priority to the provided duration value, but only update the duration style itself",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            transitionStyle: '5.5s ease-in color',
+            duration: 4,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          var style = element.attr('style');
+          expect(element.css('transition-duration')).toMatch('4s');
+          expect(element.css('transition-property')).toMatch('color');
+          expect(style).toContain('ease-in');
+        }));
+
+        it("should give priority to the provided delay value, but only update the delay style itself",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            transitionStyle: '5.5s 4s ease-in color',
+            delay: 20,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          var style = element.attr('style');
+          expect(element.css('transition-delay')).toMatch('20s');
+          expect(element.css('transition-duration')).toMatch('5.5s');
+          expect(element.css('transition-property')).toMatch('color');
+          expect(style).toContain('ease-in');
+        }));
+
+        it("should execute the animation only if there is any provided CSS styling to go with the transition",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            transitionStyle: '6s 4s ease-out all'
+          };
+
+          $animateCss(element, options).start();
+          triggerAnimationStartFrame();
+
+          expect(element.css(prefix + 'transition-delay')).not.toEqual('4s');
+          expect(element.css(prefix + 'transition-duration')).not.toEqual('6s');
+
+          options.to = { color: 'brown' };
+          $animateCss(element, options).start();
+          triggerAnimationStartFrame();
+
+          expect(element.css(prefix + 'transition-delay')).toEqual('4s');
+          expect(element.css(prefix + 'transition-duration')).toEqual('6s');
+        }));
+      });
+
+      describe("[keyframeStyle]", function() {
+        it("should apply the keyframe animation directly onto the element and animate accordingly",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            keyframeStyle: 'my_animation 5.5s',
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var detectedStyle = element.attr('style');
+          expect(detectedStyle).toContain('5.5s');
+          expect(detectedStyle).toContain('my_animation');
+
+          expect(element).toHaveClass('ng-enter');
+          expect(element).toHaveClass('ng-enter-active');
+
+          browserTrigger(element, 'animationend',
+            { timeStamp: Date.now() + 10000, elapsedTime: 5.5 });
+
+          expect(element).not.toHaveClass('ng-enter');
+          expect(element).not.toHaveClass('ng-enter-active');
+
+          expect(element.attr('style')).toBeFalsy();
+        }));
+
+        it("should give priority to the provided duration value, but only update the duration style itself",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            keyframeStyle: 'my_animation 5.5s',
+            duration: 50,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var detectedStyle = element.attr('style');
+          expect(detectedStyle).toContain('50s');
+          expect(detectedStyle).toContain('my_animation');
+        }));
+
+        it("should give priority to the provided delay value, but only update the duration style itself",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            keyframeStyle: 'my_animation 5.5s 10s',
+            delay: 50,
+            event: 'enter',
+            structural: true
+          };
+
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element.css(prefix + 'animation-delay')).toEqual('50s');
+          expect(element.css(prefix + 'animation-duration')).toEqual('5.5s');
+          expect(element.css(prefix + 'animation-name')).toEqual('my_animation');
+        }));
+
+        it("should be able to execute the animation if it is the only provided value",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            keyframeStyle: 'my_animation 5.5s 10s'
+          };
+
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element.css(prefix + 'animation-delay')).toEqual('10s');
+          expect(element.css(prefix + 'animation-duration')).toEqual('5.5s');
+          expect(element.css(prefix + 'animation-name')).toEqual('my_animation');
+        }));
+      });
+
+      describe("[from] and [to]", function() {
+        it("should apply from styles to an element during the preparation phase",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            duration: 2.5,
+            event: 'enter',
+            structural: true,
+            from: { width: '50px' },
+            to: { width: '100px' }
+          };
+
+          var animator = $animateCss(element, options);
+          expect(element.attr('style')).toMatch(/width:\s*50px/);
+        }));
+
+        it("should apply to styles to an element during the animation phase",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            duration: 2.5,
+            event: 'enter',
+            structural: true,
+            from: { width: '15px' },
+            to: { width: '25px' }
+          };
+
+          var animator = $animateCss(element, options);
+          var runner = animator.start();
+          triggerAnimationStartFrame();
+          runner.end();
+
+          expect(element.css('width')).toBe('25px');
+        }));
+
+        it("should apply the union of from and to styles to the element if no animation will be run",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            event: 'enter',
+            structural: true,
+            from: { 'width': '10px', height: '50px' },
+            to: { 'width': '15px' }
+          };
+
+          var animator = $animateCss(element, options);
+
+          expect(animator.$$willAnimate).toBeFalsy();
+          animator.start();
+
+          expect(element.css('width')).toBe('15px');
+          expect(element.css('height')).toBe('50px');
+        }));
+
+        it("should retain to and from styles on an element after an animation completes",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            event: 'enter',
+            structural: true,
+            duration: 10,
+            from: { 'width': '10px', height: '66px' },
+            to: { 'width': '5px' }
+          };
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now() + 10000, elapsedTime: 10 });
+
+          expect(element).not.toHaveClass('ng-enter');
+          expect(element.css('width')).toBe('5px');
+          expect(element.css('height')).toBe('66px');
+        }));
+
+        it("should always apply the from styles before the start function is called even if no transition is detected when started",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.my-class', 'transition: 0s linear color');
+
+          var options = {
+            addClass: 'my-class',
+            from: { height: '26px' },
+            to: { height: '500px' }
+          };
+
+          var animator = $animateCss(element, options);
+          expect(element.css('height')).toBe('26px');
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element.css('height')).toBe('500px');
+        }));
+
+        it("should apply an inline transition if [to] styles and a duration are provided",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            event: 'enter',
+            structural: true,
+            duration: 2.5,
+            to: { background: 'red' }
+          };
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var style = element.attr('style');
+          expect(element.css('transition-duration')).toMatch('2.5s');
+          expect(element.css('transition-property')).toMatch('all');
+          expect(style).toContain('linear');
+        }));
+
+        it("should remove all inline transition styling when an animation completes",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            event: 'enter',
+            structural: true,
+            duration: 2.5,
+            to: { background: 'red' }
+          };
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var style = element.attr('style');
+          expect(style).toContain('transition');
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now() + 2500, elapsedTime: 2.5 });
+
+          style = element.attr('style');
+          expect(style).not.toContain('transition');
+        }));
+
+        it("should retain existing styles when an inline styled animation completes",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            event: 'enter',
+            structural: true,
+            duration: 2.5
+          };
+
+          element.css('font-size', '20px');
+          element.css('opacity', '0.5');
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+          var style = element.attr('style');
+          expect(style).toContain('transition');
+          animator.end();
+
+          style = element.attr('style');
+          expect(element.attr('style')).not.toContain('transition');
+          expect(element.css('opacity')).toEqual('0.5');
+        }));
+
+        it("should remove all inline transition delay styling when an animation completes",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', 'transition: 1s linear color');
+
+          var options = {
+            event: 'enter',
+            structural: true,
+            delay: 5
+          };
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element.css('transition-delay')).toEqual('5s');
+
+          browserTrigger(element, 'transitionend',
+            { timeStamp: Date.now() + 5000, elapsedTime: 1 });
+
+          expect(element.attr('style') || '').not.toContain('transition');
+        }));
+
+        it("should not apply an inline transition if only [from] styles and a duration are provided",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            duration: 3,
+            from: { background: 'blue' }
+          };
+
+          var animator = $animateCss(element, options);
+          expect(animator.$$willAnimate).toBeFalsy();
+        }));
+
+        it("should apply a transition if [from] styles are provided with a class that is added",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            addClass: 'superb',
+            from: { background: 'blue' }
+          };
+
+          var animator = $animateCss(element, options);
+          expect(isFunction(animator.start)).toBe(true);
+        }));
+
+        it("should apply an inline transition if only [from] styles, but classes are added or removed and a duration is provided",
+          inject(function($animateCss, $rootElement) {
+
+          var options = {
+            duration: 3,
+            addClass: 'sugar',
+            from: { background: 'yellow' }
+          };
+
+          var animator = $animateCss(element, options);
+          expect(animator.$$willAnimate).toBeTruthy();
+        }));
+
+        it("should not apply an inline transition if no styles are provided",
+          inject(function($animateCss, $rootElement) {
+
+          var emptyObject = {};
+          var options = {
+            duration: 3,
+            to: emptyObject,
+            from: emptyObject
+          };
+
+          var animator = $animateCss(element, options);
+          expect(animator.$$willAnimate).toBeFalsy();
+        }));
+
+        it("should apply a transition duration if the existing transition duration's property value is not 'all'",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', 'transition: 1s linear color');
+
+          var emptyObject = {};
+          var options = {
+            event: 'enter',
+            structural: true,
+            to: { background: 'blue' }
+          };
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          var style = element.attr('style');
+          expect(element.css('transition-duration')).toMatch('1s');
+          expect(element.css('transition-property')).toMatch('all');
+          expect(style).toContain('linear');
+        }));
+
+        it("should apply a transition duration and an animation duration if duration + styles options are provided for a matching keyframe animation",
+          inject(function($animateCss, $rootElement) {
+
+          ss.addRule('.ng-enter', '-webkit-animation:3.5s keyframe_animation;' +
+                                          'animation:3.5s keyframe_animation;');
+
+          var emptyObject = {};
+          var options = {
+            event: 'enter',
+            structural: true,
+            duration: 10,
+            to: {
+              background: 'blue'
+            }
+          };
+
+          var animator = $animateCss(element, options);
+          animator.start();
+          triggerAnimationStartFrame();
+
+
+          expect(element.css('transition-duration')).toMatch('10s');
+          expect(element.css(prefix + 'animation-duration')).toEqual('10s');
+        }));
+      });
+
+      describe("[easing]", function() {
+
+        var element;
+        beforeEach(inject(function($$body, $rootElement) {
+          element = jqLite('<div></div>');
+          $rootElement.append(element);
+          $$body.append($rootElement);
+        }));
+
+        it("should apply easing to a transition animation if it exists", inject(function($animateCss) {
+          ss.addRule('.red', 'transition:1s linear all;');
+          var easing = 'ease-out';
+          var animator = $animateCss(element, { addClass: 'red', easing: easing });
+          animator.start();
+          triggerAnimationStartFrame();
+
+          var style = element.attr('style');
+          expect(style).toContain('ease-out');
+        }));
+
+        it("should not apply easing to transitions nor keyframes on an element animation if nothing is detected",
+          inject(function($animateCss) {
+
+          ss.addRule('.red', ';');
+          var easing = 'ease-out';
+          var animator = $animateCss(element, { addClass: 'red', easing: easing });
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element.attr('style')).toBeFalsy();
+        }));
+
+        it("should apply easing to both keyframes and transition animations if detected",
+          inject(function($animateCss) {
+
+          ss.addRule('.red', 'transition: 1s linear all;');
+          ss.addRule('.blue', prefix + 'animation:my_keyframe 1s;');
+          var easing = 'ease-out';
+          var animator = $animateCss(element, { addClass: 'red blue', easing: easing });
+          animator.start();
+          triggerAnimationStartFrame();
+
+          var style = element.attr('style');
+          expect(style).toMatch(/animation(?:-timing-function)?:\s*ease-out/);
+          expect(style).toMatch(/transition(?:-timing-function)?:\s*ease-out/);
+        }));
+      });
+
+      it('should round up long elapsedTime values to close off a CSS3 animation',
+        inject(function($animateCss) {
+
+        ss.addRule('.millisecond-transition.ng-leave', '-webkit-transition:510ms linear all;' +
+                                                       'transition:510ms linear all;');
+
+        element.addClass('millisecond-transition');
+        var animator = $animateCss(element, {
+          event: 'leave',
+          structural: true
+        });
+
+        animator.start();
+        triggerAnimationStartFrame();
+
+        expect(element).toHaveClass('ng-leave-active');
+
+        browserTrigger(element, 'transitionend',
+          { timeStamp: Date.now() + 1000, elapsedTime: 0.50999999991 });
+
+        expect(element).not.toHaveClass('ng-leave-active');
+      }));
+    });
+
+    describe('SVG', function() {
+      it('should properly apply transitions on an SVG element',
+        inject(function($animateCss, $rootScope, $compile, $$body, $rootElement) {
+
+        var element = $compile('<svg width="500" height="500">' +
+                                 '<circle cx="15" cy="5" r="100" fill="orange" />' +
+                               '</svg>')($rootScope);
+
+        $$body.append($rootElement);
+        $rootElement.append(element);
+
+        $animateCss(element, {
+          event: 'enter',
+          structural: true,
+          duration: 10
+        }).start();
+
+        triggerAnimationStartFrame();
+
+        expect(jqLiteHasClass(element[0], 'ng-enter')).toBe(true);
+        expect(jqLiteHasClass(element[0], 'ng-enter-active')).toBe(true);
+
+        browserTrigger(element, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 10 });
+
+        expect(jqLiteHasClass(element[0], 'ng-enter')).toBe(false);
+        expect(jqLiteHasClass(element[0], 'ng-enter-active')).toBe(false);
+      }));
+
+      it('should properly remove classes from SVG elements', inject(function($animateCss) {
+        var element = jqLite('<svg width="500" height="500">' +
+                                '<rect class="class-of-doom"></rect>' +
+                             '</svg>');
+        var child = element.find('rect');
+
+        var animator = $animateCss(child, {
+          removeClass: 'class-of-doom',
+          duration: 0
+        });
+        animator.start();
+
+        var className = child[0].getAttribute('class');
+        expect(className).toBe('');
+      }));
+    });
+  });
+});
diff --git a/test/ngAnimate/animateJsDriverSpec.js b/test/ngAnimate/animateJsDriverSpec.js
new file mode 100644
index 000000000000..274457965f10
--- /dev/null
+++ b/test/ngAnimate/animateJsDriverSpec.js
@@ -0,0 +1,178 @@
+'use strict';
+
+describe("ngAnimate $$animateJsDriver", function() {
+
+  beforeEach(module('ngAnimate'));
+
+  it('should register the $$animateJsDriver into the list of drivers found in $animateProvider',
+    module(function($animateProvider) {
+
+    expect($animateProvider.drivers).toContain('$$animateJsDriver');
+  }));
+
+  describe('with $$animateJs', function() {
+    var capturedAnimation = null;
+    var captureLog = [];
+    var element;
+    var driver;
+
+    beforeEach(module(function($provide) {
+      $provide.factory('$$animateJs', function($$AnimateRunner) {
+        return function() {
+          var runner = new $$AnimateRunner();
+          capturedAnimation = arguments;
+          captureLog.push({
+            args: capturedAnimation,
+            runner: runner
+          });
+          return {
+            start: function() {
+              return runner;
+            }
+          };
+        };
+      });
+
+      captureLog.length = 0;
+      element = jqLite('<div></div');
+
+      return function($rootElement, $$animateJsDriver) {
+        $rootElement.append(element);
+
+        driver = function() {
+          return $$animateJsDriver.apply($$animateJsDriver, arguments);
+        };
+      };
+    }));
+
+    it('should trigger a standard animation call to $$animateJs when a regular animation is executed',
+      inject(function($rootScope) {
+
+      driver({
+        element: element,
+        event: 'enter'
+      });
+      $rootScope.$digest();
+
+      expect(captureLog.length).toBe(1);
+
+      var args = capturedAnimation;
+      expect(args[0]).toBe(element);
+      expect(args[1]).toBe('enter');
+    }));
+
+
+    it('should trigger two regular JS animations when a grouped animation is passed in',
+      inject(function($rootScope) {
+
+      var child1 = jqLite('<div></div>');
+      element.append(child1);
+      var child2 = jqLite('<div></div>');
+      element.append(child2);
+
+      driver({
+        from: {
+          structural: true,
+          element: child1,
+          event: 'leave'
+        },
+        to: {
+          structural: true,
+          element: child2,
+          event: 'enter'
+        }
+      });
+      $rootScope.$digest();
+
+      expect(captureLog.length).toBe(2);
+
+      var first = captureLog[0].args;
+      expect(first[0]).toBe(child1);
+      expect(first[1]).toBe('leave');
+
+      var second = captureLog[1].args;
+      expect(second[0]).toBe(child2);
+      expect(second[1]).toBe('enter');
+    }));
+
+    they('should $prop both animations when $prop() is called on the runner', ['end', 'cancel'], function(method) {
+      inject(function($rootScope, $$rAF) {
+        var child1 = jqLite('<div></div>');
+        element.append(child1);
+        var child2 = jqLite('<div></div>');
+        element.append(child2);
+
+        var animator = driver({
+          from: {
+            structural: true,
+            element: child1,
+            event: 'leave'
+          },
+          to: {
+            structural: true,
+            element: child2,
+            event: 'enter'
+          }
+        });
+
+        var runner = animator.start();
+
+        var animationsClosed = false;
+        var status;
+        runner.done(function(s) {
+          animationsClosed = true;
+          status = s;
+        });
+
+        $rootScope.$digest();
+
+        runner[method]();
+        $$rAF.flush();
+
+        expect(animationsClosed).toBe(true);
+        expect(status).toBe(method === 'end' ? true : false);
+      });
+    });
+
+    they('should fully $prop when all inner animations are complete', ['end', 'cancel'], function(method) {
+      inject(function($rootScope, $$rAF) {
+        var child1 = jqLite('<div></div>');
+        element.append(child1);
+        var child2 = jqLite('<div></div>');
+        element.append(child2);
+
+        var animator = driver({
+          from: {
+            structural: true,
+            element: child1,
+            event: 'leave'
+          },
+          to: {
+            structural: true,
+            element: child2,
+            event: 'enter'
+          }
+        });
+
+        var runner = animator.start();
+
+        var animationsClosed = false;
+        var status;
+        runner.done(function(s) {
+          animationsClosed = true;
+          status = s;
+        });
+
+        $$rAF.flush();
+
+        captureLog[0].runner[method]();
+        expect(animationsClosed).toBe(false);
+
+        captureLog[1].runner[method]();
+        expect(animationsClosed).toBe(true);
+
+        expect(status).toBe(method === 'end' ? true : false);
+      });
+    });
+  });
+});
diff --git a/test/ngAnimate/animateJsSpec.js b/test/ngAnimate/animateJsSpec.js
new file mode 100644
index 000000000000..c162d678f098
--- /dev/null
+++ b/test/ngAnimate/animateJsSpec.js
@@ -0,0 +1,732 @@
+'use strict';
+
+describe("ngAnimate $$animateJs", function() {
+
+  beforeEach(module('ngAnimate'));
+
+  function getDoneFunction(args) {
+    for (var i = 1; i < args.length; i++) {
+      var a = args[i];
+      if (isFunction(a)) return a;
+    }
+  }
+
+  it('should return nothing if no animations are registered at all', inject(function($$animateJs) {
+    var element = jqLite('<div></div>');
+    expect($$animateJs(element, 'enter')).toBeFalsy();
+  }));
+
+  it('should return nothing if no matching animations classes are found', function() {
+    module(function($animateProvider) {
+      $animateProvider.register('.foo', function() {
+        return { enter: noop };
+      });
+    });
+    inject(function($$animateJs) {
+      var element = jqLite('<div class="bar"></div>');
+      expect($$animateJs(element, 'enter')).toBeFalsy();
+    });
+  });
+
+  it('should return nothing if a matching animation class is found, but not a matching event', function() {
+    module(function($animateProvider) {
+      $animateProvider.register('.foo', function() {
+        return { enter: noop };
+      });
+    });
+    inject(function($$animateJs) {
+      var element = jqLite('<div class="foo"></div>');
+      expect($$animateJs(element, 'leave')).toBeFalsy();
+    });
+  });
+
+  it('should return a truthy value if a matching animation class and event are found', function() {
+    module(function($animateProvider) {
+      $animateProvider.register('.foo', function() {
+        return { enter: noop };
+      });
+    });
+    inject(function($$animateJs) {
+      var element = jqLite('<div class="foo"></div>');
+      expect($$animateJs(element, 'enter')).toBeTruthy();
+    });
+  });
+
+  it('should strictly query for the animation based on the classes value if passed in', function() {
+    module(function($animateProvider) {
+      $animateProvider.register('.superman', function() {
+        return { enter: noop };
+      });
+      $animateProvider.register('.batman', function() {
+        return { leave: noop };
+      });
+    });
+    inject(function($$animateJs) {
+      var element = jqLite('<div class="batman"></div>');
+      expect($$animateJs(element, 'enter', 'superman')).toBeTruthy();
+      expect($$animateJs(element, 'leave', 'legoman batman')).toBeTruthy();
+      expect($$animateJs(element, 'enter', 'legoman')).toBeFalsy();
+      expect($$animateJs(element, 'leave', {})).toBeTruthy();
+    });
+  });
+
+  it('should run multiple animations in parallel', function() {
+    var doneCallbacks = [];
+    function makeAnimation(event) {
+      return function() {
+        var data = {};
+        data[event] = function(element, done) {
+          doneCallbacks.push(done);
+        };
+        return data;
+      };
+    }
+    module(function($animateProvider) {
+      $animateProvider.register('.one', makeAnimation('enter'));
+      $animateProvider.register('.two', makeAnimation('enter'));
+      $animateProvider.register('.three', makeAnimation('enter'));
+    });
+    inject(function($$animateJs, $$rAF) {
+      var element = jqLite('<div class="one two three"></div>');
+      var animator = $$animateJs(element, 'enter');
+      var complete = false;
+      animator.start().done(function() {
+        complete = true;
+      });
+      expect(doneCallbacks.length).toBe(3);
+      forEach(doneCallbacks, function(cb) {
+        cb();
+      });
+      $$rAF.flush();
+      expect(complete).toBe(true);
+    });
+  });
+
+  they('should $prop the animation when runner.$prop() is called', ['end', 'cancel'], function(method) {
+    var ended = false;
+    var status;
+    module(function($animateProvider) {
+      $animateProvider.register('.the-end', function() {
+        return {
+          enter: function() {
+            return function(cancelled) {
+              ended = true;
+              status = cancelled ? 'cancel' : 'end';
+            };
+          }
+        };
+      });
+    });
+    inject(function($$animateJs) {
+      var element = jqLite('<div class="the-end"></div>');
+      var animator = $$animateJs(element, 'enter');
+      var runner = animator.start();
+
+      expect(isFunction(runner[method])).toBe(true);
+
+      expect(ended).toBeFalsy();
+      runner[method]();
+      expect(ended).toBeTruthy();
+      expect(status).toBe(method);
+    });
+  });
+
+  they('should $prop all of the running the animations when runner.$prop() is called',
+    ['end', 'cancel'], function(method) {
+
+    var lookup = {};
+    module(function($animateProvider) {
+      forEach(['one','two','three'], function(klass) {
+        $animateProvider.register('.' + klass, function() {
+          return {
+            enter: function() {
+              return function(cancelled) {
+                lookup[klass] = cancelled ? 'cancel' : 'end';
+              };
+            }
+          };
+        });
+      });
+    });
+    inject(function($$animateJs) {
+      var element = jqLite('<div class="one two three"></div>');
+      var animator = $$animateJs(element, 'enter');
+      var runner = animator.start();
+
+      runner[method]();
+      expect(lookup.one).toBe(method);
+      expect(lookup.two).toBe(method);
+      expect(lookup.three).toBe(method);
+    });
+  });
+
+  they('should only run the $prop operation once', ['end', 'cancel'], function(method) {
+    var ended = false;
+    var count = 0;
+    module(function($animateProvider) {
+      $animateProvider.register('.the-end', function() {
+        return {
+          enter: function() {
+            return function(cancelled) {
+              ended = true;
+              count++;
+            };
+          }
+        };
+      });
+    });
+    inject(function($$animateJs) {
+      var element = jqLite('<div class="the-end"></div>');
+      var animator = $$animateJs(element, 'enter');
+      var runner = animator.start();
+
+      expect(isFunction(runner[method])).toBe(true);
+
+      expect(ended).toBeFalsy();
+      runner[method]();
+      expect(ended).toBeTruthy();
+      expect(count).toBe(1);
+
+      runner[method]();
+      expect(count).toBe(1);
+    });
+  });
+
+  it('should always run the provided animation in atleast one RAF frame if defined', function() {
+    var before, after, endCalled;
+    module(function($animateProvider) {
+      $animateProvider.register('.the-end', function() {
+        return {
+          beforeAddClass: function(element, className, done) {
+            before = done;
+          },
+          addClass: function(element, className, done) {
+            after = done;
+          }
+        };
+      });
+    });
+    inject(function($$animateJs, $$rAF) {
+      var element = jqLite('<div class="the-end"></div>');
+      var animator = $$animateJs(element, 'addClass', {
+        addClass: 'red'
+      });
+
+      var runner = animator.start();
+      runner.done(function() {
+        endCalled = true;
+      });
+
+      expect(before).toBeDefined();
+      before();
+
+      expect(after).toBeUndefined();
+      $$rAF.flush();
+      expect(after).toBeDefined();
+      after();
+
+      expect(endCalled).toBeUndefined();
+      $$rAF.flush();
+      expect(endCalled).toBe(true);
+    });
+  });
+
+  they('should still run the associated DOM event when the $prop function is run but no more animations', ['cancel', 'end'], function(method) {
+    var log = [];
+    module(function($animateProvider) {
+      $animateProvider.register('.the-end', function() {
+        return {
+          beforeAddClass: function() {
+            return function(cancelled) {
+              var status = cancelled ? 'cancel' : 'end';
+              log.push('before addClass ' + status);
+            };
+          },
+          addClass: function() {
+            return function(cancelled) {
+              var status = cancelled ? 'cancel' : 'end';
+              log.push('after addClass' + status);
+            };
+          }
+        };
+      });
+    });
+    inject(function($$animateJs, $$rAF) {
+      var element = jqLite('<div class="the-end"></div>');
+      var animator = $$animateJs(element, 'addClass', {
+        domOperation: function() {
+          log.push('dom addClass');
+        }
+      });
+      var runner = animator.start();
+      runner.done(function() {
+        log.push('addClass complete');
+      });
+      runner[method]();
+
+      $$rAF.flush();
+      expect(log).toEqual(
+        ['before addClass ' + method,
+         'dom addClass',
+         'addClass complete']);
+    });
+  });
+
+  it('should resolve the promise when end() is called', function() {
+    module(function($animateProvider) {
+      $animateProvider.register('.the-end', function() {
+        return { beforeAddClass: noop };
+      });
+    });
+    inject(function($$animateJs, $$rAF, $rootScope) {
+      var element = jqLite('<div class="the-end"></div>');
+      var animator = $$animateJs(element, 'addClass');
+      var runner = animator.start();
+      var done = false;
+      var cancelled = false;
+      runner.then(function() {
+          done = true;
+        }, function() {
+          cancelled = true;
+        });
+
+      runner.end();
+      $$rAF.flush();
+      $rootScope.$digest();
+      expect(done).toBe(true);
+      expect(cancelled).toBe(false);
+    });
+  });
+
+  it('should reject the promise when cancel() is called', function() {
+    module(function($animateProvider) {
+      $animateProvider.register('.the-end', function() {
+        return { beforeAddClass: noop };
+      });
+    });
+    inject(function($$animateJs, $$rAF, $rootScope) {
+      var element = jqLite('<div class="the-end"></div>');
+      var animator = $$animateJs(element, 'addClass');
+      var runner = animator.start();
+      var done = false;
+      var cancelled = false;
+      runner.then(function() {
+        done = true;
+      }, function() {
+        cancelled = true;
+      });
+
+      runner.cancel();
+      $$rAF.flush();
+      $rootScope.$digest();
+      expect(done).toBe(false);
+      expect(cancelled).toBe(true);
+    });
+  });
+
+  describe("events", function() {
+    var animations, runAnimation, element, log;
+    beforeEach(module(function($animateProvider) {
+      element = jqLite('<div class="test-animation"></div>');
+      animations = {};
+      log = [];
+
+      $animateProvider.register('.test-animation', function() {
+        return animations;
+      });
+
+      return function($$animateJs) {
+        runAnimation = function(method, done, error, options) {
+          options = extend(options || {}, {
+            domOperation: function() {
+              log.push('dom ' + method);
+            }
+          });
+
+          var driver = $$animateJs(element, method, 'test-animation', options);
+          driver.start().done(function(status) {
+            ((status ? done : error) || noop)();
+          });
+        };
+      };
+    }));
+
+    they("$prop should have the function signature of (element, done, options) for the after animation",
+      ['enter', 'move', 'leave'], function(event) {
+      inject(function() {
+        var args;
+        var animationOptions = {};
+        animationOptions.foo = 'bar';
+        animations[event] = function() {
+          args = arguments;
+        };
+        runAnimation(event, noop, noop, animationOptions);
+
+        expect(args.length).toBe(3);
+        expect(args[0]).toBe(element);
+        expect(isFunction(args[1])).toBe(true);
+        expect(args[2].foo).toBe(animationOptions.foo);
+      });
+    });
+
+    they("$prop should not execute a before function", enterMoveEvents, function(event) {
+      inject(function() {
+        var args;
+        var beforeMethod = 'before' + event.charAt(0).toUpperCase() + event.substr(1);
+        var animationOptions = {};
+        animations[beforeMethod] = function() {
+          args = arguments;
+        };
+
+        runAnimation(event, noop, noop, animationOptions);
+        expect(args).toBeFalsy();
+      });
+    });
+
+    they("$prop should have the function signature of (element, className, done, options) for the before animation",
+      ['addClass', 'removeClass'], function(event) {
+      inject(function() {
+        var beforeMethod = 'before' + event.charAt(0).toUpperCase() + event.substr(1);
+        var args;
+        var className = 'matias';
+        animations[beforeMethod] = function() {
+          args = arguments;
+        };
+
+        var animationOptions = {};
+        animationOptions.foo = 'bar';
+        animationOptions[event] = className;
+        runAnimation(event, noop, noop, animationOptions);
+
+        expect(args.length).toBe(4);
+        expect(args[0]).toBe(element);
+        expect(args[1]).toBe(className);
+        expect(isFunction(args[2])).toBe(true);
+        expect(args[3].foo).toBe(animationOptions.foo);
+      });
+    });
+
+    they("$prop should have the function signature of (element, className, done, options) for the after animation",
+      ['addClass', 'removeClass'], function(event) {
+      inject(function() {
+        var args;
+        var className = 'fatias';
+        animations[event] = function() {
+          args = arguments;
+        };
+
+        var animationOptions = {};
+        animationOptions.foo = 'bar';
+        animationOptions[event] = className;
+        runAnimation(event, noop, noop, animationOptions);
+
+        expect(args.length).toBe(4);
+        expect(args[0]).toBe(element);
+        expect(args[1]).toBe(className);
+        expect(isFunction(args[2])).toBe(true);
+        expect(args[3].foo).toBe(animationOptions.foo);
+      });
+    });
+
+    they("setClass should have the function signature of (element, addClass, removeClass, done, options) for the $prop animation", ['before', 'after'], function(event) {
+      inject(function() {
+        var args;
+        var method = event === 'before' ? 'beforeSetClass' : 'setClass';
+        animations[method] = function() {
+          args = arguments;
+        };
+
+        var addClass = 'on';
+        var removeClass = 'on';
+        var animationOptions = {
+          foo: 'bar',
+          addClass: addClass,
+          removeClass: removeClass
+        };
+        runAnimation('setClass', noop, noop, animationOptions);
+
+        expect(args.length).toBe(5);
+        expect(args[0]).toBe(element);
+        expect(args[1]).toBe(addClass);
+        expect(args[2]).toBe(removeClass);
+        expect(isFunction(args[3])).toBe(true);
+        expect(args[4].foo).toBe(animationOptions.foo);
+      });
+    });
+
+    they("animate should have the function signature of (element, from, to, done, options) for the $prop animation", ['before', 'after'], function(event) {
+      inject(function() {
+        var args;
+        var method = event === 'before' ? 'beforeAnimate' : 'animate';
+        animations[method] = function() {
+          args = arguments;
+        };
+
+        var to = { color: 'red' };
+        var from = { color: 'blue' };
+        var animationOptions = {
+          foo: 'bar',
+          to: to,
+          from: from
+        };
+        runAnimation('animate', noop, noop, animationOptions);
+
+        expect(args.length).toBe(5);
+        expect(args[0]).toBe(element);
+        expect(args[1]).toBe(from);
+        expect(args[2]).toBe(to);
+        expect(isFunction(args[3])).toBe(true);
+        expect(args[4].foo).toBe(animationOptions.foo);
+      });
+    });
+
+    they("custom events should have the function signature of (element, done, options) for the $prop animation", ['before', 'after'], function(event) {
+      inject(function() {
+        var args;
+        var method = event === 'before' ? 'beforeCustom' : 'custom';
+        animations[method] = function() {
+          args = arguments;
+        };
+
+        var animationOptions = {};
+        animationOptions.foo = 'bar';
+        runAnimation('custom', noop, noop, animationOptions);
+
+        expect(args.length).toBe(3);
+        expect(args[0]).toBe(element);
+        expect(isFunction(args[1])).toBe(true);
+        expect(args[2].foo).toBe(animationOptions.foo);
+      });
+    });
+
+    var enterMoveEvents = ['enter', 'move'];
+    var otherEvents = ['addClass', 'removeClass', 'setClass'];
+    var allEvents = ['leave'].concat(otherEvents).concat(enterMoveEvents);
+
+    they("$prop should asynchronously render the before$prop animation", otherEvents, function(event) {
+      inject(function($$rAF) {
+        var beforeMethod = 'before' + event.charAt(0).toUpperCase() + event.substr(1);
+        animations[beforeMethod] = function(element, a, b, c) {
+          log.push('before ' + event);
+          var done = getDoneFunction(arguments);
+          done();
+        };
+
+        runAnimation(event);
+        expect(log).toEqual(['before ' + event]);
+        $$rAF.flush();
+
+        expect(log).toEqual(['before ' + event, 'dom ' + event]);
+      });
+    });
+
+    they("$prop should asynchronously render the $prop animation", allEvents, function(event) {
+      inject(function($$rAF) {
+        animations[event] = function(element, a, b, c) {
+          log.push('after ' + event);
+          var done = getDoneFunction(arguments);
+          done();
+        };
+
+        runAnimation(event, function() {
+          log.push('complete');
+        });
+
+        if (event === 'leave') {
+          expect(log).toEqual(['after leave']);
+          $$rAF.flush();
+          expect(log).toEqual(['after leave', 'dom leave', 'complete']);
+        } else {
+          expect(log).toEqual(['dom ' + event, 'after ' + event]);
+          $$rAF.flush();
+          expect(log).toEqual(['dom ' + event, 'after ' + event, 'complete']);
+        }
+      });
+    });
+
+    they("$prop should asynchronously render the $prop animation when a start/end animator object is returned",
+      allEvents, function(event) {
+
+      inject(function($$rAF, $$AnimateRunner) {
+        var runner;
+        animations[event] = function(element, a, b, c) {
+          return {
+            start: function() {
+              log.push('start ' + event);
+              return runner = new $$AnimateRunner();
+            }
+          };
+        };
+
+        runAnimation(event, function() {
+          log.push('complete');
+        });
+
+        if (event === 'leave') {
+          expect(log).toEqual(['start leave']);
+          runner.end();
+          $$rAF.flush();
+          expect(log).toEqual(['start leave', 'dom leave', 'complete']);
+        } else {
+          expect(log).toEqual(['dom ' + event, 'start ' + event]);
+          runner.end();
+          $$rAF.flush();
+          expect(log).toEqual(['dom ' + event, 'start ' + event, 'complete']);
+        }
+      });
+    });
+
+    they("$prop should asynchronously render the $prop animation when an instance of $$AnimateRunner is returned",
+      allEvents, function(event) {
+
+      inject(function($$rAF, $$AnimateRunner) {
+        var runner;
+        animations[event] = function(element, a, b, c) {
+          log.push('start ' + event);
+          return runner = new $$AnimateRunner();
+        };
+
+        runAnimation(event, function() {
+          log.push('complete');
+        });
+
+        if (event === 'leave') {
+          expect(log).toEqual(['start leave']);
+          runner.end();
+          $$rAF.flush();
+          expect(log).toEqual(['start leave', 'dom leave', 'complete']);
+        } else {
+          expect(log).toEqual(['dom ' + event, 'start ' + event]);
+          runner.end();
+          $$rAF.flush();
+          expect(log).toEqual(['dom ' + event, 'start ' + event, 'complete']);
+        }
+      });
+    });
+
+    they("$prop should asynchronously reject the before animation if the callback function is called with false", otherEvents, function(event) {
+      inject(function($$rAF, $rootScope) {
+        var beforeMethod = 'before' + event.charAt(0).toUpperCase() + event.substr(1);
+        animations[beforeMethod] = function(element, a, b, c) {
+          log.push('before ' + event);
+          var done = getDoneFunction(arguments);
+          done(false);
+        };
+
+        animations[event] = function(element, a, b, c) {
+          log.push('after ' + event);
+          var done = getDoneFunction(arguments);
+          done();
+        };
+
+        runAnimation(event,
+          function() { log.push('pass'); },
+          function() { log.push('fail'); });
+
+        expect(log).toEqual(['before ' + event]);
+        $$rAF.flush();
+        expect(log).toEqual(['before ' + event, 'dom ' + event, 'fail']);
+      });
+    });
+
+    they("$prop should asynchronously reject the after animation if the callback function is called with false", allEvents, function(event) {
+      inject(function($$rAF, $rootScope) {
+        animations[event] = function(element, a, b, c) {
+          log.push('after ' + event);
+          var done = getDoneFunction(arguments);
+          done(false);
+        };
+
+        runAnimation(event,
+          function() { log.push('pass'); },
+          function() { log.push('fail'); });
+
+        var expectations = [];
+        if (event === 'leave') {
+          expect(log).toEqual(['after leave']);
+          $$rAF.flush();
+          expect(log).toEqual(['after leave', 'dom leave', 'fail']);
+        } else {
+          expect(log).toEqual(['dom ' + event, 'after ' + event]);
+          $$rAF.flush();
+          expect(log).toEqual(['dom ' + event, 'after ' + event, 'fail']);
+        }
+      });
+    });
+
+    it('setClass should delegate down to addClass/removeClass if not defined', inject(function($$rAF) {
+      animations.addClass = function(element, done) {
+        log.push('addClass');
+      };
+
+      animations.removeClass = function(element, done) {
+        log.push('removeClass');
+      };
+
+      expect(animations.setClass).toBeFalsy();
+
+      runAnimation('setClass');
+
+      expect(log).toEqual(['dom setClass', 'removeClass', 'addClass']);
+    }));
+
+    it('beforeSetClass should delegate down to beforeAddClass/beforeRemoveClass if not defined',
+      inject(function($$rAF) {
+
+      animations.beforeAddClass = function(element, className, done) {
+        log.push('beforeAddClass');
+        done();
+      };
+
+      animations.beforeRemoveClass = function(element, className, done) {
+        log.push('beforeRemoveClass');
+        done();
+      };
+
+      expect(animations.setClass).toBeFalsy();
+
+      runAnimation('setClass');
+      $$rAF.flush();
+
+      expect(log).toEqual(['beforeRemoveClass', 'beforeAddClass', 'dom setClass']);
+    }));
+
+    it('leave should always ignore the `beforeLeave` animation',
+      inject(function($$rAF) {
+
+      animations.beforeLeave = function(element, done) {
+        log.push('beforeLeave');
+        done();
+      };
+
+      animations.leave = function(element, done) {
+        log.push('leave');
+        done();
+      };
+
+      runAnimation('leave');
+      $$rAF.flush();
+
+      expect(log).toEqual(['leave', 'dom leave']);
+    }));
+
+    it('should allow custom events to be triggered',
+      inject(function($$rAF) {
+
+      animations.beforeFlex = function(element, done) {
+        log.push('beforeFlex');
+        done();
+      };
+
+      animations.flex = function(element, done) {
+        log.push('flex');
+        done();
+      };
+
+      runAnimation('flex');
+      $$rAF.flush();
+
+      expect(log).toEqual(['beforeFlex', 'dom flex', 'flex']);
+    }));
+  });
+});
diff --git a/test/ngAnimate/animateRunnerSpec.js b/test/ngAnimate/animateRunnerSpec.js
new file mode 100644
index 000000000000..94178fba6189
--- /dev/null
+++ b/test/ngAnimate/animateRunnerSpec.js
@@ -0,0 +1,340 @@
+'use strict';
+
+describe('$$rAFMutex', function() {
+  beforeEach(module('ngAnimate'));
+
+  it('should fire the callback only when one or more RAFs have passed',
+    inject(function($$rAF, $$rAFMutex) {
+
+    var trigger = $$rAFMutex();
+    var called = false;
+    trigger(function() {
+      called = true;
+    });
+
+    expect(called).toBe(false);
+    $$rAF.flush();
+    expect(called).toBe(true);
+  }));
+
+  it('should immediately fire the callback if a RAF has passed since construction',
+    inject(function($$rAF, $$rAFMutex) {
+
+    var trigger = $$rAFMutex();
+    $$rAF.flush();
+
+    var called = false;
+    trigger(function() {
+      called = true;
+    });
+    expect(called).toBe(true);
+  }));
+});
+
+describe("$$AnimateRunner", function() {
+
+  beforeEach(module('ngAnimate'));
+
+  they("should trigger the host $prop function",
+    ['end', 'cancel', 'pause', 'resume'], function(method) {
+
+    inject(function($$AnimateRunner) {
+      var host = {};
+      var spy = host[method] = jasmine.createSpy();
+      var runner = new $$AnimateRunner(host);
+      runner[method]();
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+
+  they("should trigger the inner runner's host $prop function",
+    ['end', 'cancel', 'pause', 'resume'], function(method) {
+
+    inject(function($$AnimateRunner) {
+      var host = {};
+      var spy = host[method] = jasmine.createSpy();
+      var runner1 = new $$AnimateRunner();
+      var runner2 = new $$AnimateRunner(host);
+      runner1.setHost(runner2);
+      runner1[method]();
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+
+  it("should resolve the done function only if one RAF has passed",
+    inject(function($$AnimateRunner, $$rAF) {
+
+    var runner = new $$AnimateRunner();
+    var spy = jasmine.createSpy();
+    runner.done(spy);
+    runner.complete(true);
+    expect(spy).not.toHaveBeenCalled();
+    $$rAF.flush();
+    expect(spy).toHaveBeenCalled();
+  }));
+
+  it("should resolve with the status provided in the completion function",
+    inject(function($$AnimateRunner, $$rAF) {
+
+    var runner = new $$AnimateRunner();
+    var capturedValue;
+    runner.done(function(val) {
+      capturedValue = val;
+    });
+    runner.complete('special value');
+    $$rAF.flush();
+    expect(capturedValue).toBe('special value');
+  }));
+
+  they("should immediately resolve each combined runner in a bottom-up order when $prop is called",
+    ['end', 'cancel'], function(method) {
+
+    inject(function($$AnimateRunner, $$rAF) {
+      var runner1 = new $$AnimateRunner();
+      var runner2 = new $$AnimateRunner();
+      runner1.setHost(runner2);
+
+      var status1, status2, signature = '';
+      runner1.done(function(status) {
+        signature += '1';
+        status1 = status;
+      });
+
+      runner2.done(function(status) {
+        signature += '2';
+        status2 = status;
+      });
+
+      runner1[method]();
+
+      var expectedStatus = method === 'end' ? true : false;
+      expect(status1).toBe(expectedStatus);
+      expect(status2).toBe(expectedStatus);
+      expect(signature).toBe('21');
+    });
+  });
+
+  they("should resolve/reject using a newly created promise when .then() is used upon $prop",
+    ['end', 'cancel'], function(method) {
+
+    inject(function($$AnimateRunner, $rootScope) {
+      var runner1 = new $$AnimateRunner();
+      var runner2 = new $$AnimateRunner();
+      runner1.setHost(runner2);
+
+      var status1;
+      runner1.then(
+        function() { status1 = 'pass'; },
+        function() { status1 = 'fail'; });
+
+      var status2;
+      runner2.then(
+        function() { status2 = 'pass'; },
+        function() { status2 = 'fail'; });
+
+      runner1[method]();
+
+      var expectedStatus = method === 'end' ? 'pass' : 'fail';
+
+      expect(status1).toBeUndefined();
+      expect(status2).toBeUndefined();
+
+      $rootScope.$digest();
+      expect(status1).toBe(expectedStatus);
+      expect(status2).toBe(expectedStatus);
+    });
+  });
+
+  it("should expose/create the contained promise when getPromise() is called",
+    inject(function($$AnimateRunner, $rootScope) {
+
+    var runner = new $$AnimateRunner();
+    expect(isPromiseLike(runner.getPromise())).toBeTruthy();
+  }));
+
+  it("should expose the `catch` promise function to handle the rejected state",
+    inject(function($$AnimateRunner, $rootScope) {
+
+    var runner = new $$AnimateRunner();
+    var animationFailed = false;
+    runner.catch(function() {
+      animationFailed = true;
+    });
+    runner.cancel();
+    $rootScope.$digest();
+    expect(animationFailed).toBe(true);
+  }));
+
+  they("should expose the `finally` promise function to handle the final state when $prop",
+    { 'rejected': 'cancel', 'resolved': 'end' }, function(method) {
+    inject(function($$AnimateRunner, $rootScope) {
+        var runner = new $$AnimateRunner();
+        var animationComplete = false;
+        runner.finally(function() {
+          animationComplete = true;
+        });
+        runner[method]();
+        $rootScope.$digest();
+        expect(animationComplete).toBe(true);
+    });
+  });
+
+  describe(".all()", function() {
+    it("should resolve when all runners have naturally resolved",
+      inject(function($$rAF, $$AnimateRunner) {
+
+      var runner1 = new $$AnimateRunner();
+      var runner2 = new $$AnimateRunner();
+      var runner3 = new $$AnimateRunner();
+
+      var status;
+      $$AnimateRunner.all([runner1, runner2, runner3], function(response) {
+        status = response;
+      });
+
+      runner1.complete(true);
+      runner2.complete(true);
+      runner3.complete(true);
+
+      expect(status).toBeUndefined();
+
+      $$rAF.flush();
+
+      expect(status).toBe(true);
+    }));
+
+    they("should immediately resolve if and when all runners have been $prop",
+      { ended: 'end', cancelled: 'cancel' }, function(method) {
+
+      inject(function($$rAF, $$AnimateRunner) {
+        var runner1 = new $$AnimateRunner();
+        var runner2 = new $$AnimateRunner();
+        var runner3 = new $$AnimateRunner();
+
+        var expectedStatus = method === 'end' ? true : false;
+
+        var status;
+        $$AnimateRunner.all([runner1, runner2, runner3], function(response) {
+          status = response;
+        });
+
+        runner1[method]();
+        runner2[method]();
+        runner3[method]();
+
+        expect(status).toBe(expectedStatus);
+      });
+    });
+
+    it("should return a status of `false` if one or more runners was cancelled",
+      inject(function($$rAF, $$AnimateRunner) {
+
+      var runner1 = new $$AnimateRunner();
+      var runner2 = new $$AnimateRunner();
+      var runner3 = new $$AnimateRunner();
+
+      var status;
+      $$AnimateRunner.all([runner1, runner2, runner3], function(response) {
+        status = response;
+      });
+
+      runner1.end();
+      runner2.end();
+      runner3.cancel();
+
+      expect(status).toBe(false);
+    }));
+  });
+
+  describe(".chain()", function() {
+    it("should evaluate an array of functions in a chain",
+      inject(function($$rAF, $$AnimateRunner) {
+
+      var runner1 = new $$AnimateRunner();
+      var runner2 = new $$AnimateRunner();
+      var runner3 = new $$AnimateRunner();
+
+      var log = [];
+
+      var items = [];
+      items.push(function(fn) {
+        runner1.done(function() {
+          log.push(1);
+          fn();
+        });
+      });
+
+      items.push(function(fn) {
+        runner2.done(function() {
+          log.push(2);
+          fn();
+        });
+      });
+
+      items.push(function(fn) {
+        runner3.done(function() {
+          log.push(3);
+          fn();
+        });
+      });
+
+      var status;
+      $$AnimateRunner.chain(items, function(response) {
+        status = response;
+      });
+
+      $$rAF.flush();
+
+      runner2.complete(true);
+      expect(log).toEqual([]);
+      expect(status).toBeUndefined();
+
+      runner1.complete(true);
+      expect(log).toEqual([1,2]);
+      expect(status).toBeUndefined();
+
+      runner3.complete(true);
+      expect(log).toEqual([1,2,3]);
+      expect(status).toBe(true);
+    }));
+
+    it("should break the chian when a function evaluates to false",
+      inject(function($$rAF, $$AnimateRunner) {
+
+      var runner1 = new $$AnimateRunner();
+      var runner2 = new $$AnimateRunner();
+      var runner3 = new $$AnimateRunner();
+      var runner4 = new $$AnimateRunner();
+      var runner5 = new $$AnimateRunner();
+      var runner6 = new $$AnimateRunner();
+
+      var log = [];
+
+      var items = [];
+      items.push(function(fn) { log.push(1); runner1.done(fn); });
+      items.push(function(fn) { log.push(2); runner2.done(fn); });
+      items.push(function(fn) { log.push(3); runner3.done(fn); });
+      items.push(function(fn) { log.push(4); runner4.done(fn); });
+      items.push(function(fn) { log.push(5); runner5.done(fn); });
+      items.push(function(fn) { log.push(6); runner6.done(fn); });
+
+      var status;
+      $$AnimateRunner.chain(items, function(response) {
+        status = response;
+      });
+
+      runner1.complete('');
+      runner2.complete(null);
+      runner3.complete(undefined);
+      runner4.complete(0);
+      runner5.complete(false);
+
+      runner6.complete(true);
+
+      $$rAF.flush();
+
+      expect(log).toEqual([1,2,3,4,5]);
+      expect(status).toBe(false);
+    }));
+  });
+});
diff --git a/test/ngAnimate/animateSpec.js b/test/ngAnimate/animateSpec.js
index be5a1b59e27e..7d2b96bc2085 100644
--- a/test/ngAnimate/animateSpec.js
+++ b/test/ngAnimate/animateSpec.js
@@ -1,5578 +1,1779 @@
 'use strict';
 
-describe("ngAnimate", function() {
-  var $originalAnimate;
-  beforeEach(module(function($provide) {
-    $provide.decorator('$animate', function($delegate) {
-      $originalAnimate = $delegate;
-      return $delegate;
-    });
-  }));
-  beforeEach(module('ngAnimate'));
-  beforeEach(module('ngAnimateMock'));
-
-  function getMaxValue(prop, element, $window) {
-    var node = element[0];
-    var cs = $window.getComputedStyle(node);
-    var prop0 = 'webkit' + prop.charAt(0).toUpperCase() + prop.substr(1);
-    var values = (cs[prop0] || cs[prop]).split(/\s*,\s*/);
-    var maxDelay = 0;
-    forEach(values, function(value) {
-      maxDelay = Math.max(parseFloat(value) || 0, maxDelay);
-    });
-    return maxDelay;
-  }
-
-  it("should disable animations on bootstrap for structural animations even after the first digest has passed", function() {
-    var hasBeenAnimated = false;
-    module(function($animateProvider) {
-      $animateProvider.register('.my-structrual-animation', function() {
-        return {
-          enter: function(element, done) {
-            hasBeenAnimated = true;
-            done();
-          },
-          leave: function(element, done) {
-            hasBeenAnimated = true;
-            done();
-          }
-        };
-      });
-    });
-    inject(function($rootScope, $compile, $animate, $rootElement, $document) {
-      var element = $compile('<div class="my-structrual-animation">...</div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
-
-      $animate.enter(element, $rootElement);
-      $rootScope.$digest();
-
-      expect(hasBeenAnimated).toBe(false);
-
-      $animate.leave(element);
-      $rootScope.$digest();
-
-      expect(hasBeenAnimated).toBe(true);
-    });
-  });
-
-  it("should disable animations for two digests until all pending HTTP requests are complete during bootstrap", function() {
-    var animateSpy = jasmine.createSpy();
-    module(function($animateProvider, $compileProvider) {
-      $compileProvider.directive('myRemoteDirective', function() {
-        return {
-          templateUrl: 'remote.html'
-        };
-      });
-      $animateProvider.register('.my-structrual-animation', function() {
-        return {
-          enter: animateSpy,
-          leave: animateSpy
-        };
-      });
-    });
-    inject(function($rootScope, $compile, $animate, $rootElement, $document, $httpBackend) {
-
-      $httpBackend.whenGET('remote.html').respond(200, '<strong>content</strong>');
-
-      var element = $compile('<div my-remote-directive class="my-structrual-animation">...</div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
-
-      // running this twice just to prove that the dual post digest is run
-      $rootScope.$digest();
-      $rootScope.$digest();
-
-      $animate.enter(element, $rootElement);
-      $rootScope.$digest();
-
-      expect(animateSpy).not.toHaveBeenCalled();
-
-      $httpBackend.flush();
-      $rootScope.$digest();
-
-      $animate.leave(element);
-      $rootScope.$digest();
-
-      expect(animateSpy).toHaveBeenCalled();
-    });
-  });
-
-
-  //we use another describe block because the before/after operations below
-  //are used across all animations tests and we don't want that same behavior
-  //to be used on the root describe block at the start of the animateSpec.js file
-  describe('', function() {
-
-    var ss, body;
-    beforeEach(module(function() {
-      body = jqLite(document.body);
-      return function($window, $document, $animate, $timeout, $rootScope) {
-        ss = createMockStyleSheet($document, $window);
-        try {
-          $timeout.flush();
-        } catch (e) {}
-        $animate.enabled(true);
-        $rootScope.$digest();
-      };
-    }));
-
-    afterEach(function() {
-      if (ss) {
-        ss.destroy();
-      }
-      dealoc(body);
-    });
-
-
-    describe("$animate", function() {
-
-      var element, $rootElement;
-
-      function html(content) {
-        body.append($rootElement);
-        $rootElement.html(content);
-        element = $rootElement.children().eq(0);
-        return element;
-      }
-
-      describe("enable / disable", function() {
-
-        it("should work for all animations", inject(function($animate) {
-
-          expect($animate.enabled()).toBe(true);
-
-          expect($animate.enabled(0)).toBe(false);
-          expect($animate.enabled()).toBe(false);
-
-          expect($animate.enabled(1)).toBe(true);
-          expect($animate.enabled()).toBe(true);
-        }));
-
-
-        it('should place a hard disable on all child animations', function() {
-          var count = 0;
-          module(function($animateProvider) {
-            $animateProvider.register('.animated', function() {
-              return {
-                addClass: function(element, className, done) {
-                  count++;
-                  done();
-                }
-              };
-            });
-          });
-          inject(function($compile, $rootScope, $animate, $sniffer, $rootElement) {
-            $animate.enabled(true);
-
-            var elm1 = $compile('<div class="animated"></div>')($rootScope);
-            var elm2 = $compile('<div class="animated"></div>')($rootScope);
-            $rootElement.append(elm1);
-            angular.element(document.body).append($rootElement);
-
-            $animate.addClass(elm1, 'klass');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(count).toBe(1);
-
-            $animate.enabled(false);
-
-            $animate.addClass(elm1, 'klass2');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(count).toBe(1);
-
-            $animate.enabled(true);
-
-            elm1.append(elm2);
-
-            $animate.addClass(elm2, 'klass');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(count).toBe(2);
-
-            $animate.enabled(false, elm1);
-
-            $animate.addClass(elm2, 'klass2');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(count).toBe(2);
-
-            var root = angular.element($rootElement[0]);
-            $rootElement.addClass('animated');
-            $animate.addClass(root, 'klass2');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(count).toBe(3);
-          });
-        });
-
-
-        it('should skip animations if the element is attached to the $rootElement', function() {
-          var count = 0;
-          module(function($animateProvider) {
-            $animateProvider.register('.animated', function() {
-              return {
-                addClass: function(element, className, done) {
-                  count++;
-                  done();
-                }
-              };
-            });
-          });
-          inject(function($compile, $rootScope, $animate) {
-            $animate.enabled(true);
-
-            var elm1 = $compile('<div class="animated"></div>')($rootScope);
-
-            $animate.addClass(elm1, 'klass2');
-            $rootScope.$digest();
-            expect(count).toBe(0);
-          });
-        });
-
-
-        it('should check enable/disable animations up until the $rootElement element', function() {
-          var rootElm = jqLite('<div></div>');
-
-          var captured = false;
-          module(function($provide, $animateProvider) {
-            $provide.value('$rootElement', rootElm);
-            $animateProvider.register('.capture-animation', function() {
-              return {
-                addClass: function(element, className, done) {
-                  captured = true;
-                  done();
-                }
-              };
-            });
-          });
-          inject(function($animate, $rootElement, $rootScope, $compile) {
-            angular.bootstrap(rootElm, ['ngAnimate']);
-
-            $animate.enabled(true);
-
-            var element = $compile('<div class="capture-animation"></div>')($rootScope);
-            rootElm.append(element);
-
-            expect(captured).toBe(false);
-            $animate.addClass(element, 'red');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(captured).toBe(true);
-
-            captured = false;
-            $animate.enabled(false);
-
-            $animate.addClass(element, 'blue');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(captured).toBe(false);
-
-            //clean up the mess
-            $animate.enabled(false, rootElm);
-            dealoc(rootElm);
-          });
-        });
-      });
-
-
-      describe("with polyfill", function() {
-
-        var child, after;
-
-        beforeEach(function() {
-          module(function($animateProvider) {
-            $animateProvider.register('.custom', function() {
-              return {
-                start: function(element, done) {
-                  done();
-                }
-              };
-            });
-            $animateProvider.register('.custom-delay', function($timeout) {
-              function animate(element, done) {
-                done = arguments.length == 4 ? arguments[2] : done;
-                $timeout(done, 2000, false);
-                return function() {
-                  element.addClass('animation-cancelled');
-                };
-              }
-              return {
-                leave: animate,
-                addClass: animate,
-                removeClass: animate
-              };
-            });
-            $animateProvider.register('.custom-long-delay', function($timeout) {
-              function animate(element, done) {
-                done = arguments.length == 4 ? arguments[2] : done;
-                $timeout(done, 20000, false);
-                return function(cancelled) {
-                  element.addClass(cancelled ? 'animation-cancelled' : 'animation-ended');
-                };
-              }
-              return {
-                leave: animate,
-                addClass: animate,
-                removeClass: animate
-              };
-            });
-            $animateProvider.register('.setup-memo', function() {
-              return {
-                removeClass: function(element, className, done) {
-                  element.text('memento');
-                  done();
-                }
-              };
-            });
-            return function($animate, $compile, $rootScope, $rootElement) {
-              element = $compile('<div></div>')($rootScope);
-
-              forEach(['.ng-hide-add', '.ng-hide-remove', '.ng-enter', '.ng-leave', '.ng-move', '.my-inline-animation'], function(selector) {
-                ss.addRule(selector, '-webkit-transition:1s linear all;' +
-                                             'transition:1s linear all;');
-              });
-
-              child = $compile('<div>...</div>')($rootScope);
-              jqLite($document[0].body).append($rootElement);
-              element.append(child);
-
-              after   = $compile('<div></div>')($rootScope);
-              $rootElement.append(element);
-            };
-          });
-        });
-
-
-        it("should animate the enter animation event",
-          inject(function($animate, $rootScope, $sniffer) {
-          element[0].removeChild(child[0]);
-
-          expect(element.contents().length).toBe(0);
-          $animate.enter(child, element);
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(child.hasClass('ng-enter')).toBe(true);
-            expect(child.hasClass('ng-enter-active')).toBe(true);
-            browserTrigger(element, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-
-          expect(element.contents().length).toBe(1);
-        }));
-
-        it("should animate the enter animation event with native dom elements",
-          inject(function($animate, $rootScope, $sniffer) {
-          element[0].removeChild(child[0]);
-
-          expect(element.contents().length).toBe(0);
-          $animate.enter(child[0], element[0]);
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(child.hasClass('ng-enter')).toBe(true);
-            expect(child.hasClass('ng-enter-active')).toBe(true);
-            browserTrigger(element, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-
-          expect(element.contents().length).toBe(1);
-        }));
-
-
-        it("should animate the leave animation event",
-          inject(function($animate, $rootScope, $sniffer) {
-
-          expect(element.contents().length).toBe(1);
-          $animate.leave(child);
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(child.hasClass('ng-leave')).toBe(true);
-            expect(child.hasClass('ng-leave-active')).toBe(true);
-            browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-
-          expect(element.contents().length).toBe(0);
-        }));
-
-        it("should animate the leave animation event with native dom elements",
-          inject(function($animate, $rootScope, $sniffer) {
-
-          expect(element.contents().length).toBe(1);
-          $animate.leave(child[0]);
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(child.hasClass('ng-leave')).toBe(true);
-            expect(child.hasClass('ng-leave-active')).toBe(true);
-            browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-
-          expect(element.contents().length).toBe(0);
-        }));
-
-        it("should animate the move animation event",
-          inject(function($animate, $compile, $rootScope, $timeout, $sniffer) {
-
-          $rootScope.$digest();
-          element.empty();
-
-          var child1 = $compile('<div>1</div>')($rootScope);
-          var child2 = $compile('<div>2</div>')($rootScope);
-          element.append(child1);
-          element.append(child2);
-          expect(element.text()).toBe('12');
-          $animate.move(child1, element, child2);
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-          }
-          expect(element.text()).toBe('21');
-        }));
-
-        it("should animate the move animation event with native dom elements",
-          inject(function($animate, $compile, $rootScope, $timeout, $sniffer) {
-
-          $rootScope.$digest();
-          element.empty();
-
-          var child1 = $compile('<div>1</div>')($rootScope);
-          var child2 = $compile('<div>2</div>')($rootScope);
-          element.append(child1);
-          element.append(child2);
-          expect(element.text()).toBe('12');
-          $animate.move(child1[0], element[0], child2[0]);
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-          }
-          expect(element.text()).toBe('21');
-        }));
-
-        it("should perform the animate event",
-          inject(function($animate, $compile, $rootScope, $timeout, $sniffer) {
-
-          $rootScope.$digest();
-          $animate.animate(element, { color: 'rgb(255, 0, 0)' }, { color: 'rgb(0, 0, 255)' }, 'animated');
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            expect(element.css('color')).toBe('rgb(255, 0, 0)');
-            $animate.triggerReflow();
-          }
-          expect(element.css('color')).toBe('rgb(0, 0, 255)');
-        }));
-
-        it("should animate the show animation event",
-          inject(function($animate, $rootScope, $sniffer) {
-
-          $rootScope.$digest();
-          child.addClass('ng-hide');
-          expect(child).toBeHidden();
-          $animate.removeClass(child, 'ng-hide');
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(child.hasClass('ng-hide-remove')).toBe(true);
-            expect(child.hasClass('ng-hide-remove-active')).toBe(true);
-            browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-          expect(child.hasClass('ng-hide-remove')).toBe(false);
-          expect(child.hasClass('ng-hide-remove-active')).toBe(false);
-          expect(child).toBeShown();
-        }));
-
-        it("should animate the hide animation event",
-          inject(function($animate, $rootScope, $sniffer) {
-
-          $rootScope.$digest();
-          expect(child).toBeShown();
-          $animate.addClass(child, 'ng-hide');
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(child.hasClass('ng-hide-add')).toBe(true);
-            expect(child.hasClass('ng-hide-add-active')).toBe(true);
-            browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-          expect(child).toBeHidden();
-        }));
-
-
-        it("should exclusively animate the setClass animation event", function() {
-          var count = 0, fallback = jasmine.createSpy('callback');
-          module(function($animateProvider) {
-            $animateProvider.register('.classify', function() {
-              return {
-                beforeAddClass: fallback,
-                addClass: fallback,
-                beforeRemoveClass: fallback,
-                removeClass: fallback,
-
-                beforeSetClass: function(element, add, remove, done) {
-                  count++;
-                  expect(add).toBe('yes');
-                  expect(remove).toBe('no');
-                  done();
-                },
-                setClass: function(element, add, remove, done) {
-                  count++;
-                  expect(add).toBe('yes');
-                  expect(remove).toBe('no');
-                  done();
-                }
-              };
-            });
-          });
-          inject(function($animate, $rootScope) {
-            child.attr('class','classify no');
-            $animate.setClass(child, 'yes', 'no');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(child.hasClass('yes')).toBe(true);
-            expect(child.hasClass('no')).toBe(false);
-            expect(count).toBe(2);
-
-            expect(fallback).not.toHaveBeenCalled();
-          });
-        });
-
-        it("should exclusively animate the setClass animation event with native dom elements", function() {
-          var count = 0, fallback = jasmine.createSpy('callback');
-          module(function($animateProvider) {
-            $animateProvider.register('.classify', function() {
-              return {
-                beforeAddClass: fallback,
-                addClass: fallback,
-                beforeRemoveClass: fallback,
-                removeClass: fallback,
-
-                beforeSetClass: function(element, add, remove, done) {
-                  count++;
-                  expect(add).toBe('yes');
-                  expect(remove).toBe('no');
-                  done();
-                },
-                setClass: function(element, add, remove, done) {
-                  count++;
-                  expect(add).toBe('yes');
-                  expect(remove).toBe('no');
-                  done();
-                }
-              };
-            });
-          });
-          inject(function($animate, $rootScope) {
-            child.attr('class','classify no');
-            $animate.setClass(child[0], 'yes', 'no');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(child.hasClass('yes')).toBe(true);
-            expect(child.hasClass('no')).toBe(false);
-            expect(count).toBe(2);
-
-            expect(fallback).not.toHaveBeenCalled();
-          });
-        });
-
-        it("should delegate down to addClass/removeClass if a setClass animation is not found", function() {
-          var count = 0;
-          module(function($animateProvider) {
-            $animateProvider.register('.classify', function() {
-              return {
-                beforeAddClass: function(element, className, done) {
-                  count++;
-                  expect(className).toBe('yes');
-                  done();
-                },
-                addClass: function(element, className, done) {
-                  count++;
-                  expect(className).toBe('yes');
-                  done();
-                },
-                beforeRemoveClass: function(element, className, done) {
-                  count++;
-                  expect(className).toBe('no');
-                  done();
-                },
-                removeClass: function(element, className, done) {
-                  count++;
-                  expect(className).toBe('no');
-                  done();
-                }
-              };
-            });
-          });
-          inject(function($animate, $rootScope) {
-            child.attr('class','classify no');
-            $animate.setClass(child, 'yes', 'no');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(child.hasClass('yes')).toBe(true);
-            expect(child.hasClass('no')).toBe(false);
-            expect(count).toBe(4);
-          });
-        });
-
-        it("should assign the ng-event className to all animation events when transitions/keyframes are used",
-          inject(function($animate, $sniffer, $rootScope) {
-
-          if (!$sniffer.transitions) return;
-
-          $rootScope.$digest();
-          element[0].removeChild(child[0]);
-
-          //enter
-          $animate.enter(child, element);
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          expect(child.attr('class')).toContain('ng-enter');
-          expect(child.attr('class')).toContain('ng-enter-active');
-          browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          $animate.triggerCallbackPromise();
-
-          //move
-          element.append(after);
-          $animate.move(child, element, after);
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          expect(child.attr('class')).toContain('ng-move');
-          expect(child.attr('class')).toContain('ng-move-active');
-          browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          $animate.triggerCallbackPromise();
-
-          //hide
-          $animate.addClass(child, 'ng-hide');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          expect(child.attr('class')).toContain('ng-hide-add');
-          expect(child.attr('class')).toContain('ng-hide-add-active');
-          browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-
-          //show
-          $animate.removeClass(child, 'ng-hide');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          expect(child.attr('class')).toContain('ng-hide-remove');
-          expect(child.attr('class')).toContain('ng-hide-remove-active');
-          browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-
-          //animate
-          $animate.animate(child, null, null, 'my-inline-animation');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          expect(child.attr('class')).toContain('my-inline-animation');
-          expect(child.attr('class')).toContain('my-inline-animation-active');
-          browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          $animate.triggerCallbackPromise();
-
-          //leave
-          $animate.leave(child);
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          expect(child.attr('class')).toContain('ng-leave');
-          expect(child.attr('class')).toContain('ng-leave-active');
-          browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-        }));
-
-
-        it("should trigger a cancellation when the return function is called upon any animation", function() {
-          var captures = {};
-
-          module(function($animateProvider) {
-            $animateProvider.register('.track-me', function() {
-              return {
-                enter: track('enter'),
-                leave: track('leave'),
-                move: track('move'),
-                addClass: track('addClass'),
-                removeClass: track('removeClass'),
-                setClass: track('setClass')
-              };
-
-              function track(type) {
-                return function(element, add, remove, done) {
-                  done = done || remove || add;
-                  return function(cancelled) {
-                    captures[type]=cancelled;
-                  };
-                };
-              }
-            });
-          });
-          inject(function($animate, $sniffer, $rootScope) {
-
-            var promise;
-            $animate.enabled(true);
-            $rootScope.$digest();
-            element[0].removeChild(child[0]);
-            child.addClass('track-me');
-
-            //enter
-            promise = $animate.enter(child, element);
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(captures.enter).toBeUndefined();
-            $animate.cancel(promise);
-            expect(captures.enter).toBeTruthy();
-            $animate.triggerCallbackPromise();
-
-            //move
-            element.append(after);
-            promise = $animate.move(child, element, after);
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(captures.move).toBeUndefined();
-            $animate.cancel(promise);
-            expect(captures.move).toBeTruthy();
-            $animate.triggerCallbackPromise();
-
-            //addClass
-            promise = $animate.addClass(child, 'ng-hide');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(captures.addClass).toBeUndefined();
-            $animate.cancel(promise);
-            expect(captures.addClass).toBeTruthy();
-            $animate.triggerCallbackPromise();
-
-            //removeClass
-            promise = $animate.removeClass(child, 'ng-hide');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(captures.removeClass).toBeUndefined();
-            $animate.cancel(promise);
-            expect(captures.removeClass).toBeTruthy();
-            $animate.triggerCallbackPromise();
-
-            //setClass
-            child.addClass('red');
-            promise = $animate.setClass(child, 'blue', 'red');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(captures.setClass).toBeUndefined();
-            $animate.cancel(promise);
-            expect(captures.setClass).toBeTruthy();
-            $animate.triggerCallbackPromise();
-
-            //leave
-            promise = $animate.leave(child);
-            $rootScope.$digest();
-
-            expect(captures.leave).toBeUndefined();
-            $animate.cancel(promise);
-            expect(captures.leave).toBeTruthy();
-            $animate.triggerCallbackPromise();
-          });
-        });
-
-
-        it("should not run if animations are disabled",
-          inject(function($animate, $rootScope, $timeout, $sniffer) {
-
-          $animate.enabled(false);
-
-          $rootScope.$digest();
-
-          element.addClass('setup-memo');
-
-          element.text('123');
-          expect(element.text()).toBe('123');
-          $animate.removeClass(element, 'ng-hide');
-          $rootScope.$digest();
-          expect(element.text()).toBe('123');
-
-          $animate.enabled(true);
-
-          element.addClass('ng-hide');
-          $animate.removeClass(element, 'ng-hide');
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-          }
-          expect(element.text()).toBe('memento');
-        }));
-
-
-        it("should only call done() once and right away if another animation takes place in between",
-          inject(function($animate, $rootScope, $sniffer, $timeout) {
-
-          element.append(child);
-          child.addClass('custom-delay');
-
-          expect(element).toBeShown();
-          $animate.addClass(child, 'ng-hide');
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            expect(child).toBeShown();
-          }
-
-          $animate.leave(child);
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-          }
-          expect(child).toBeHidden(); //hides instantly
-
-          //lets change this to prove that done doesn't fire anymore for the previous hide() operation
-          child.css('display','block');
-          child.removeClass('ng-hide');
-
-          if ($sniffer.transitions) {
-            expect(element.children().length).toBe(1); //still animating
-            browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-          $timeout.flush(2000);
-          $timeout.flush(2000);
-          expect(child).toBeShown();
-
-          expect(element.children().length).toBe(0);
-        }));
-
-
-        it("should retain existing styles of the animated element",
-          inject(function($animate, $rootScope, $sniffer) {
-
-          element.append(child);
-          child.attr('style', 'width: 20px');
-
-          $animate.addClass(child, 'ng-hide');
-          $rootScope.$digest();
-
-          $animate.leave(child);
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-
-            //this is to verify that the existing style is appended with a semicolon automatically
-            expect(child.attr('style')).toMatch(/width: 20px;.*?/i);
-            browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-
-          expect(child.attr('style')).toMatch(/width: 20px/i);
-        }));
-
-
-        it("should call the cancel callback when another animation is called on the same element",
-          inject(function($animate, $rootScope, $sniffer, $timeout) {
-
-          element.append(child);
-
-          child.addClass('custom-delay ng-hide');
-          $animate.removeClass(child, 'ng-hide');
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-          $timeout.flush(2000);
-
-          $animate.addClass(child, 'ng-hide');
-
-          expect(child.hasClass('animation-cancelled')).toBe(true);
-        }));
-
-        it("should remove the .ng-animate class after the next animation is run which interrupted the last animation", function() {
-          var addClassDone, removeClassDone,
-              addClassDoneSpy = jasmine.createSpy(),
-              removeClassDoneSpy = jasmine.createSpy();
-
-          module(function($animateProvider) {
-            $animateProvider.register('.hide', function() {
-              return {
-                addClass: function(element, className, done) {
-                  addClassDone = done;
-                  return addClassDoneSpy;
-                },
-                removeClass: function(element, className, done) {
-                  removeClassDone = done;
-                  return removeClassDoneSpy;
-                }
-              };
-            });
-          });
-
-          inject(function($animate, $rootScope) {
-            $animate.addClass(element, 'hide');
-            $rootScope.$digest();
-
-            expect(element).toHaveClass('ng-animate');
-
-            $animate.triggerReflow();
-
-            $animate.removeClass(element, 'hide');
-            $rootScope.$digest();
-            expect(addClassDoneSpy).toHaveBeenCalled();
-
-            $animate.triggerReflow();
-
-            expect(element).toHaveClass('ng-animate');
-
-            removeClassDone();
-            $animate.triggerCallbackPromise();
-
-            expect(element).not.toHaveClass('ng-animate');
-          });
-        });
-
-        it("should skip a class-based animation if the same element already has an ongoing structural animation",
-          inject(function($animate, $rootScope, $sniffer) {
-
-          var completed = false;
-          $animate.enter(child, element, null).then(function() {
-            completed = true;
-          });
-          $rootScope.$digest();
-
-          expect(completed).toBe(false);
-
-          $animate.addClass(child, 'green');
-          $rootScope.$digest();
-          expect(element.hasClass('green'));
-
-          expect(completed).toBe(false);
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-          $animate.triggerCallbackPromise();
-
-          expect(completed).toBe(true);
-        }));
-
-        it("should skip class-based animations if animations are directly disabled on the same element", function() {
-          var capture;
-          module(function($animateProvider) {
-            $animateProvider.register('.capture', function() {
-              return {
-                addClass: function(element, className, done) {
-                  capture = true;
-                  done();
-                }
-              };
-            });
-          });
-          inject(function($animate, $rootScope) {
-            $animate.enabled(true);
-            $animate.enabled(false, element);
-
-            $animate.addClass(element, 'capture');
-            $rootScope.$digest();
-            expect(element.hasClass('capture')).toBe(true);
-            expect(capture).not.toBe(true);
-          });
-        });
-
-        it("should not apply a cancellation when addClass is done multiple times",
-          inject(function($animate, $rootScope, $sniffer, $timeout) {
-
-          element.append(child);
-
-          $animate.addClass(child, 'custom-delay');
-          $rootScope.$digest();
-
-          $animate.addClass(child, 'custom-long-delay');
-          $rootScope.$digest();
-
-          $animate.triggerReflow();
-
-          expect(child.hasClass('animation-cancelled')).toBe(false);
-          expect(child.hasClass('animation-ended')).toBe(false);
-
-          $timeout.flush();
-          expect(child.hasClass('animation-ended')).toBe(true);
-        }));
-
-
-        it("should NOT clobber all data on an element when animation is finished",
-          inject(function($animate, $rootScope) {
-
-          child.css('display','none');
-          element.data('foo', 'bar');
-
-          $animate.removeClass(element, 'ng-hide');
-          $rootScope.$digest();
-
-          $animate.addClass(element, 'ng-hide');
-          $rootScope.$digest();
-
-          expect(element.data('foo')).toEqual('bar');
-        }));
-
-
-        it("should allow multiple JS animations which run in parallel",
-          inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
-
-            $animate.addClass(element, 'custom-delay custom-long-delay');
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            $timeout.flush(2000);
-            $timeout.flush(20000);
-            expect(element.hasClass('custom-delay')).toBe(true);
-            expect(element.hasClass('custom-long-delay')).toBe(true);
-          })
-        );
-
-
-        it("should allow both multiple JS and CSS animations which run in parallel",
-          inject(function($animate, $rootScope, $compile, $sniffer, $timeout, _$rootElement_) {
-          $rootElement = _$rootElement_;
-
-          ss.addRule('.ng-hide-add', '-webkit-transition:1s linear all;' +
-                                             'transition:1s linear all;');
-          ss.addRule('.ng-hide-remove', '-webkit-transition:1s linear all;' +
-                                                'transition:1s linear all;');
-
-          element = $compile(html('<div>1</div>'))($rootScope);
-          element.addClass('custom-delay custom-long-delay');
-          $rootScope.$digest();
-
-          $animate.removeClass(element, 'ng-hide');
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-          $timeout.flush(2000);
-          $timeout.flush(20000);
-
-          expect(element.hasClass('custom-delay')).toBe(true);
-          expect(element.hasClass('custom-delay-add')).toBe(false);
-          expect(element.hasClass('custom-delay-add-active')).toBe(false);
-
-          expect(element.hasClass('custom-long-delay')).toBe(true);
-          expect(element.hasClass('custom-long-delay-add')).toBe(false);
-          expect(element.hasClass('custom-long-delay-add-active')).toBe(false);
-        }));
-
-        it('should apply directive styles and provide the style collection to the animation function', function() {
-          var animationDone;
-          var animationStyles;
-          var proxyAnimation = function() {
-            var limit = arguments.length - 1;
-            animationStyles = arguments[limit];
-            animationDone = arguments[limit - 1];
-          };
-          module(function($animateProvider) {
-            $animateProvider.register('.capture', function() {
-              return {
-                enter: proxyAnimation,
-                leave: proxyAnimation,
-                move: proxyAnimation,
-                addClass: proxyAnimation,
-                removeClass: proxyAnimation,
-                setClass: proxyAnimation
-              };
-            });
-          });
-          inject(function($animate, $rootScope, $compile, $sniffer, $timeout, _$rootElement_) {
-            $rootElement = _$rootElement_;
-
-            $animate.enabled(true);
-
-            element = $compile(html('<div></div>'))($rootScope);
-            var otherParent = $compile('<div></div>')($rootScope);
-            var child = $compile('<div class="capture" style="transition: 0s!important; -webkit-transition: 0s!important;"></div>')($rootScope);
-
-            $rootElement.append(otherParent);
-            $rootScope.$digest();
-
-            var styles = {
-              from: { backgroundColor: 'blue' },
-              to: { backgroundColor: 'red' }
-            };
-
-            //enter
-            $animate.enter(child, element, null, styles);
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(animationStyles).toEqual(styles);
-            animationDone();
-            animationDone = animationStyles = null;
-            $animate.triggerCallbacks();
-
-            //move
-            $animate.move(child, null, otherParent, styles);
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(animationStyles).toEqual(styles);
-            animationDone();
-            animationDone = animationStyles = null;
-            $animate.triggerCallbacks();
-
-            //addClass
-            $animate.addClass(child, 'on', styles);
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(animationStyles).toEqual(styles);
-            animationDone();
-            animationDone = animationStyles = null;
-            $animate.triggerCallbacks();
-
-            //setClass
-            $animate.setClass(child, 'off', 'on', styles);
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(animationStyles).toEqual(styles);
-            animationDone();
-            animationDone = animationStyles = null;
-            $animate.triggerCallbacks();
-
-            //removeClass
-            $animate.removeClass(child, 'off', styles);
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(animationStyles).toEqual(styles);
-            animationDone();
-            animationDone = animationStyles = null;
-            $animate.triggerCallbacks();
-
-            //leave
-            $animate.leave(child, styles);
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(animationStyles).toEqual(styles);
-            animationDone();
-            animationDone = animationStyles = null;
-            $animate.triggerCallbacks();
-
-            dealoc(otherParent);
-          });
-        });
-      });
-
-      it("should apply animated styles even if there are no detected animations",
-        inject(function($compile, $animate, $rootScope, $sniffer, $rootElement, $document) {
-
-        $animate.enabled(true);
-        jqLite($document[0].body).append($rootElement);
-
-        element = $compile('<div class="fake-animation"></div>')($rootScope);
-
-        $animate.enter(element, $rootElement, null, {
-          to: {borderColor: 'red'}
-        });
-
-        $rootScope.$digest();
-        expect(element).toHaveClass('ng-animate');
-
-        $animate.triggerReflow();
-        $animate.triggerCallbacks();
-
-        expect(element).not.toHaveClass('ng-animate');
-        expect(element.attr('style')).toMatch(/border-color: red/);
-      }));
-
-      describe("with CSS3", function() {
-
-        beforeEach(function() {
-          module(function() {
-            return function(_$rootElement_) {
-              $rootElement = _$rootElement_;
-            };
-          });
-        });
-
-        /* The CSS animation handler must always be rendered before the other JS animation
-           handlers. This is important since the CSS animation handler may place temporary
-           styling on the HTML element before the reflow commences which in turn may override
-           other transition or keyframe styles that any former JS animations may have placed
-           on the element: https://github.com/angular/angular.js/issues/6675 */
-        it("should always perform the CSS animation before the JS animation", function() {
-          var log = [];
-          module(function($animateProvider) {
-            //CSS animation handler
-            $animateProvider.register('', function() {
-              return {
-                leave: function() { log.push('css'); }
-              };
-            });
-            //custom JS animation handler
-            $animateProvider.register('.js-animation', function() {
-              return {
-                leave: function() { log.push('js'); }
-              };
-            });
-          });
-          inject(function($animate, $rootScope, $compile, $sniffer) {
-            if (!$sniffer.transitions) return;
-
-            element = $compile(html('<div class="js-animation"></div>'))($rootScope);
-            $animate.leave(element);
-            $rootScope.$digest();
-            expect(log).toEqual(['css','js']);
-          });
-        });
-
-
-        describe("Animations", function() {
-
-          it("should properly detect and make use of CSS Animations",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-            ss.addRule('.ng-hide-add',
-                           '-webkit-animation: some_animation 4s linear 0s 1 alternate;' +
-                                   'animation: some_animation 4s linear 0s 1 alternate;');
-            ss.addRule('.ng-hide-remove',
-                           '-webkit-animation: some_animation 4s linear 0s 1 alternate;' +
-                                   'animation: some_animation 4s linear 0s 1 alternate;');
-
-            element = $compile(html('<div>1</div>'))($rootScope);
-
-            element.addClass('ng-hide');
-            expect(element).toBeHidden();
-
-            $animate.removeClass(element, 'ng-hide');
-            $rootScope.$digest();
-            if ($sniffer.animations) {
-              $animate.triggerReflow();
-              browserTrigger(element,'animationend', { timeStamp: Date.now() + 4000, elapsedTime: 4 });
-            }
-            expect(element).toBeShown();
-          }));
-
-
-          it("should properly detect and make use of CSS Animations with multiple iterations",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-            var style = '-webkit-animation-duration: 2s;' +
-                        '-webkit-animation-iteration-count: 3;' +
-                                'animation-duration: 2s;' +
-                                'animation-iteration-count: 3;';
-
-            ss.addRule('.ng-hide-add', style);
-            ss.addRule('.ng-hide-remove', style);
-
-            element = $compile(html('<div>1</div>'))($rootScope);
-
-            element.addClass('ng-hide');
-            expect(element).toBeHidden();
-
-            $animate.removeClass(element, 'ng-hide');
-            $rootScope.$digest();
-            if ($sniffer.animations) {
-              $animate.triggerReflow();
-              browserTrigger(element,'animationend', { timeStamp: Date.now() + 6000, elapsedTime: 6 });
-            }
-            expect(element).toBeShown();
-          }));
-
-
-          it("should not consider the animation delay is provided",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-            var style = '-webkit-animation-duration: 2s;' +
-                        '-webkit-animation-delay: 10s;' +
-                        '-webkit-animation-iteration-count: 5;' +
-                                'animation-duration: 2s;' +
-                                'animation-delay: 10s;' +
-                                'animation-iteration-count: 5;';
-
-            ss.addRule('.ng-hide-add', style);
-            ss.addRule('.ng-hide-remove', style);
-
-            element = $compile(html('<div>1</div>'))($rootScope);
-
-            element.addClass('ng-hide');
-            expect(element).toBeHidden();
-
-            $animate.removeClass(element, 'ng-hide');
-            $rootScope.$digest();
-            if ($sniffer.transitions) {
-              $animate.triggerReflow();
-              browserTrigger(element,'animationend', { timeStamp: Date.now() + 20000, elapsedTime: 10 });
-            }
-            expect(element).toBeShown();
-          }));
-
-
-          it("should skip animations if disabled and run when enabled",
-              inject(function($animate, $rootScope, $compile) {
-            $animate.enabled(false);
-            var style = '-webkit-animation: some_animation 2s linear 0s 1 alternate;' +
-                                'animation: some_animation 2s linear 0s 1 alternate;';
-
-            ss.addRule('.ng-hide-add', style);
-            ss.addRule('.ng-hide-remove', style);
-
-            element = $compile(html('<div>1</div>'))($rootScope);
-            element.addClass('ng-hide');
-            expect(element).toBeHidden();
-            $animate.removeClass(element, 'ng-hide');
-            $rootScope.$digest();
-            expect(element).toBeShown();
-          }));
-
-
-          it("should finish the previous animation when a new animation is started",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-              var style = '-webkit-animation: some_animation 2s linear 0s 1 alternate;' +
-                                  'animation: some_animation 2s linear 0s 1 alternate;';
-
-              ss.addRule('.ng-hide-add', style);
-              ss.addRule('.ng-hide-remove', style);
-
-              element = $compile(html('<div class="ng-hide">1</div>'))($rootScope);
-              element.addClass('custom');
-
-              $animate.removeClass(element, 'ng-hide');
-              $rootScope.$digest();
-
-              if ($sniffer.animations) {
-                $animate.triggerReflow();
-                expect(element.hasClass('ng-hide-remove')).toBe(true);
-                expect(element.hasClass('ng-hide-remove-active')).toBe(true);
-              }
-
-              element.removeClass('ng-hide');
-              $animate.addClass(element, 'ng-hide');
-              $rootScope.$digest();
-
-              expect(element.hasClass('ng-hide-remove')).toBe(false); //added right away
-
-              if ($sniffer.animations) { //cleanup some pending animations
-                $animate.triggerReflow();
-                expect(element.hasClass('ng-hide-add')).toBe(true);
-                expect(element.hasClass('ng-hide-add-active')).toBe(true);
-                browserTrigger(element,'animationend', { timeStamp: Date.now() + 2000, elapsedTime: 2 });
-              }
-
-              expect(element.hasClass('ng-hide-remove-active')).toBe(false);
-            })
-          );
-
-          it("should piggy-back-transition the styles with the max keyframe duration if provided by the directive",
-            inject(function($compile, $animate, $rootScope, $sniffer) {
-
-            $animate.enabled(true);
-            ss.addRule('.on', '-webkit-animation: 1s keyframeanimation; animation: 1s keyframeanimation;');
-
-            element = $compile(html('<div>1</div>'))($rootScope);
-
-            $animate.addClass(element, 'on', {
-              to: {borderColor: 'blue'}
-            });
-
-            $rootScope.$digest();
-            if ($sniffer.transitions) {
-              $animate.triggerReflow();
-              expect(element.attr('style')).toContain('border-color: blue');
-              expect(element.attr('style')).toMatch(/transition:.*1s/);
-              browserTrigger(element,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-            }
-
-            expect(element.attr('style')).toContain('border-color: blue');
-          }));
-
-          it("should not apply a piggy-back-transition if the styles object contains no styles",
-            inject(function($compile, $animate, $rootScope, $sniffer) {
-
-            if (!$sniffer.animations) return;
-
-            $animate.enabled(true);
-            ss.addRule('.on', '-webkit-animation: 1s super-animation; animation: 1s super-animation;');
-
-            element = $compile(html('<div>1</div>'))($rootScope);
-
-            $animate.addClass(element, 'on', {
-              to: {}
-            });
-
-            $rootScope.$digest();
-            $animate.triggerReflow();
-            expect(element.attr('style')).not.toMatch(/transition/);
-          }));
-
-          it("should pause the playstate when performing a stagger animation",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
-
-            if (!$sniffer.animations) return;
-
-            $animate.enabled(true);
-
-            ss.addRule('.real-animation.ng-enter, .real-animation.ng-leave',
-              '-webkit-animation:1s my_animation;' +
-              'animation:1s my_animation;');
-
-            ss.addRule('.real-animation.ng-enter-stagger, .real-animation.ng-leave-stagger',
-              '-webkit-animation-delay:0.1s;' +
-              '-webkit-animation-duration:0s;' +
-              'animation-delay:0.1s;' +
-              'animation-duration:0s;');
-
-            ss.addRule('.fake-animation.ng-enter-stagger, .fake-animation.ng-leave-stagger',
-              '-webkit-animation-delay:0.1s;' +
-              '-webkit-animation-duration:1s;' +
-              'animation-delay:0.1s;' +
-              'animation-duration:1s;');
-
-            var container = $compile(html('<div></div>'))($rootScope);
-
-            var newScope, element, elements = [];
-            for (var i = 0; i < 5; i++) {
-              newScope = $rootScope.$new();
-              element = $compile('<div class="real-animation"></div>')(newScope);
-              $animate.enter(element, container);
-              elements.push(element);
-            }
-
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect(elements[0].attr('style')).toBeFalsy();
-            for (i = 1; i < 5; i++) {
-              expect(elements[i].attr('style')).toMatch(/animation-play-state:\s*paused/);
-            }
-
-            //final closing timeout
-            $timeout.flush();
-
-            for (i = 0; i < 5; i++) {
-              dealoc(elements[i]);
-              newScope = $rootScope.$new();
-              element = $compile('<div class="fake-animation"></div>')(newScope);
-              $animate.enter(element, container);
-              elements[i] = element;
-            }
-
-            $rootScope.$digest();
-
-            //this means no animations were triggered
-            $timeout.verifyNoPendingTasks();
-
-            expect(elements[0].attr('style')).toBeFalsy();
-            for (i = 1; i < 5; i++) {
-              expect(elements[i].attr('style')).not.toMatch(/animation-play-state:\s*paused/);
-            }
-          }));
-
-
-          it("should block and unblock keyframe animations when a stagger animation kicks in while skipping the first element",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
-
-            if (!$sniffer.animations) return;
-
-            $animate.enabled(true);
-
-            ss.addRule('.blocked-animation.ng-enter',
-              '-webkit-animation:my_animation 1s;' +
-              'animation:my_animation 1s;');
-
-            ss.addRule('.blocked-animation.ng-enter-stagger',
-              '-webkit-animation-delay:0.2s;' +
-              'animation-delay:0.2s;');
-
-            var container = $compile(html('<div></div>'))($rootScope);
-
-            var elements = [];
-            for (var i = 0; i < 4; i++) {
-              var newScope = $rootScope.$new();
-              var element = $compile('<div class="blocked-animation"></div>')(newScope);
-              $animate.enter(element, container);
-              elements.push(element);
-            }
-
-            $rootScope.$digest();
-
-            expect(elements[0].attr('style')).toBeUndefined();
-            for (i = 1; i < 4; i++) {
-              expect(elements[i].attr('style')).toMatch(/animation-play-state:\s*paused/);
-            }
-
-            $animate.triggerReflow();
-
-            expect(elements[0].attr('style')).toBeUndefined();
-            for (i = 1; i < 4; i++) {
-              expect(elements[i].attr('style')).toMatch(/animation-play-state:\s*paused/);
-            }
-
-            $timeout.flush(800);
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i].attr('style')).not.toMatch(/animation-play-state/);
-            }
-          }));
-
-          it("should stagger items when multiple animation durations/delays are defined",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout, $document, $rootElement, $window) {
-
-            if (!$sniffer.transitions) return;
-
-            $animate.enabled(true);
-
-            ss.addRule('.stagger-animation.ng-enter, .stagger-animation.ng-leave',
-              '-webkit-animation:my_animation 1s 1s, your_animation 1s 2s;' +
-              'animation:my_animation 1s 1s, your_animation 1s 2s;');
-
-            ss.addRule('.stagger-animation.ng-enter-stagger, .stagger-animation.ng-leave-stagger',
-              '-webkit-animation-delay:0.1s;' +
-              'animation-delay:0.1s;');
-
-            var container = $compile(html('<div></div>'))($rootScope);
-
-            var elements = [];
-            for (var i = 0; i < 4; i++) {
-              var newScope = $rootScope.$new();
-              var element = $compile('<div class="stagger-animation"></div>')(newScope);
-              $animate.enter(element, container);
-              elements.push(element);
-            }
-
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i]).not.toHaveClass('ng-enter-active');
-              expect(elements[i]).toHaveClass('ng-enter-pending');
-              expect(getMaxValue('animationDelay', elements[i], $window)).toBe(2);
-            }
-
-            $timeout.flush(300);
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i]).toHaveClass('ng-enter-active');
-              expect(elements[i]).not.toHaveClass('ng-enter-pending');
-              expect(getMaxValue('animationDelay', elements[i], $window)).toBe(2);
-            }
-          }));
-
-          it("should stagger items and apply the transition + directive styles the right time when piggy-back styles are used",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout, $document, $rootElement, $window) {
-
-            if (!$sniffer.transitions) return;
-
-            $animate.enabled(true);
-
-            ss.addRule('.stagger-animation.ng-enter, .stagger-animation.ng-leave',
-              '-webkit-animation:my_animation 1s 1s, your_animation 1s 2s;' +
-              'animation:my_animation 1s 1s, your_animation 1s 2s;');
-
-            ss.addRule('.stagger-animation.ng-enter-stagger, .stagger-animation.ng-leave-stagger',
-              '-webkit-animation-delay:0.1s;' +
-              'animation-delay:0.1s;');
-
-            var styles = {
-              from: { left: '50px' },
-              to: { left: '100px' }
-            };
-            var container = $compile(html('<div></div>'))($rootScope);
-
-            var elements = [];
-            for (var i = 0; i < 4; i++) {
-              var newScope = $rootScope.$new();
-              var element = $compile('<div class="stagger-animation"></div>')(newScope);
-              $animate.enter(element, container, null, styles);
-              elements.push(element);
-            }
-
-            $rootScope.$digest();
-
-            for (i = 0; i < 4; i++) {
-              expect(elements[i]).toHaveClass('ng-enter');
-              assertTransitionDuration(elements[i], '2', true);
-              assertLeftStyle(elements[i], '50');
-            }
-
-            $animate.triggerReflow();
-
-            expect(elements[0]).toHaveClass('ng-enter-active');
-            assertLeftStyle(elements[0], '100');
-            assertTransitionDuration(elements[0], '1');
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i]).not.toHaveClass('ng-enter-active');
-              assertTransitionDuration(elements[i], '1', true);
-              assertLeftStyle(elements[i], '100', true);
-            }
-
-            $timeout.flush(300);
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i]).toHaveClass('ng-enter-active');
-              assertTransitionDuration(elements[i], '1');
-              assertLeftStyle(elements[i], '100');
-            }
-
-            $timeout.flush();
-
-            for (i = 0; i < 4; i++) {
-              expect(elements[i]).not.toHaveClass('ng-enter');
-              expect(elements[i]).not.toHaveClass('ng-enter-active');
-              assertTransitionDuration(elements[i], '1', true);
-              assertLeftStyle(elements[i], '100');
-            }
-
-            function assertLeftStyle(element, val, not) {
-              var regex = new RegExp('left: ' + val + 'px');
-              var style = element.attr('style');
-              not ? expect(style).not.toMatch(regex)
-                  : expect(style).toMatch(regex);
-            }
-
-            function assertTransitionDuration(element, val, not) {
-              var regex = new RegExp('transition:.*' + val + 's');
-              var style = element.attr('style');
-              not ? expect(style).not.toMatch(regex)
-                  : expect(style).toMatch(regex);
-            }
-          }));
-        });
-
-
-        describe("Transitions", function() {
-
-          it("should skip transitions if disabled and run when enabled",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-            var style = '-webkit-transition: 1s linear all;' +
-                                'transition: 1s linear all;';
-
-            ss.addRule('.ng-hide-add', style);
-            ss.addRule('.ng-hide-remove', style);
-
-            $animate.enabled(false);
-            element = $compile(html('<div>1</div>'))($rootScope);
-
-            element.addClass('ng-hide');
-            expect(element).toBeHidden();
-            $animate.removeClass(element, 'ng-hide');
-            $rootScope.$digest();
-            expect(element).toBeShown();
-
-            $animate.enabled(true);
-
-            element.addClass('ng-hide');
-            expect(element).toBeHidden();
-
-            $animate.removeClass(element, 'ng-hide');
-            $rootScope.$digest();
-            if ($sniffer.transitions) {
-              $animate.triggerReflow();
-              browserTrigger(element,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-            }
-            expect(element).toBeShown();
-          }));
-
-
-          it("should skip animations if disabled and run when enabled picking the longest specified duration",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-              var style = '-webkit-transition-duration: 1s, 2000ms, 1s;' +
-                          '-webkit-transition-property: height, left, opacity;' +
-                                  'transition-duration: 1s, 2000ms, 1s;' +
-                                   'transition-property: height, left, opacity;';
-
-              ss.addRule('.ng-hide-add', style);
-              ss.addRule('.ng-hide-remove', style);
-
-              element = $compile(html('<div>foo</div>'))($rootScope);
-              element.addClass('ng-hide');
-
-              $animate.removeClass(element, 'ng-hide');
-              $rootScope.$digest();
-
-              if ($sniffer.transitions) {
-                $animate.triggerReflow();
-                var now = Date.now();
-                browserTrigger(element,'transitionend', { timeStamp: now + 1000, elapsedTime: 1 });
-                browserTrigger(element,'transitionend', { timeStamp: now + 1000, elapsedTime: 1 });
-                browserTrigger(element,'transitionend', { timeStamp: now + 2000, elapsedTime: 2 });
-                expect(element.hasClass('ng-animate')).toBe(false);
-              }
-              expect(element).toBeShown();
-            }));
-
-
-          it("should skip animations if disabled and run when enabled picking the longest specified duration/delay combination",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-              $animate.enabled(false);
-              var style = '-webkit-transition-duration: 1s, 0s, 1s; ' +
-                          '-webkit-transition-delay: 2s, 1000ms, 2s; ' +
-                          '-webkit-transition-property: height, left, opacity;' +
-                                  'transition-duration: 1s, 0s, 1s; ' +
-                                  'transition-delay: 2s, 1000ms, 2s; ' +
-                                  'transition-property: height, left, opacity;';
-
-              ss.addRule('.ng-hide-add', style);
-              ss.addRule('.ng-hide-remove', style);
-
-              element = $compile(html('<div>foo</div>'))($rootScope);
-
-              element.addClass('ng-hide');
-              $animate.removeClass(element, 'ng-hide');
-              $rootScope.$digest();
-
-              expect(element).toBeShown();
-              $animate.enabled(true);
-
-              element.addClass('ng-hide');
-              expect(element).toBeHidden();
-
-              $animate.removeClass(element, 'ng-hide');
-              $rootScope.$digest();
-              if ($sniffer.transitions) {
-                $animate.triggerReflow();
-                var now = Date.now();
-                browserTrigger(element,'transitionend', { timeStamp: now + 1000, elapsedTime: 1 });
-                browserTrigger(element,'transitionend', { timeStamp: now + 3000, elapsedTime: 3 });
-                browserTrigger(element,'transitionend', { timeStamp: now + 3000, elapsedTime: 3 });
-              }
-              expect(element).toBeShown();
-            })
-          );
-
-
-          it("should NOT overwrite styles with outdated values when animation completes",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-              if (!$sniffer.transitions) return;
-
-              var style = '-webkit-transition-duration: 1s, 2000ms, 1s;' +
-                          '-webkit-transition-property: height, left, opacity;' +
-                                  'transition-duration: 1s, 2000ms, 1s;' +
-                                   'transition-property: height, left, opacity;';
-
-              ss.addRule('.ng-hide-add', style);
-              ss.addRule('.ng-hide-remove', style);
-
-              element = $compile(html('<div style="width: 100px">foo</div>'))($rootScope);
-              element.addClass('ng-hide');
-
-              $animate.removeClass(element, 'ng-hide');
-              $rootScope.$digest();
-
-              $animate.triggerReflow();
-
-              var now = Date.now();
-              browserTrigger(element,'transitionend', { timeStamp: now + 1000, elapsedTime: 1 });
-              browserTrigger(element,'transitionend', { timeStamp: now + 1000, elapsedTime: 1 });
-
-              element.css('width', '200px');
-              browserTrigger(element,'transitionend', { timeStamp: now + 2000, elapsedTime: 2 });
-              expect(element.css('width')).toBe("200px");
-            }));
-
-          it("should NOT overwrite styles when a transition with a specific property is used",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-            if (!$sniffer.transitions) return;
-
-            var style = '-webkit-transition: border linear .2s;' +
-                                'transition: border linear .2s;';
-
-            ss.addRule('.on', style);
-            element = $compile(html('<div style="height:200px"></div>'))($rootScope);
-            $animate.addClass(element, 'on');
-            $rootScope.$digest();
-
-            $animate.triggerReflow();
-
-            var now = Date.now();
-            browserTrigger(element,'transitionend', { timeStamp: now + 200, elapsedTime: 0.2 });
-            expect(element.css('height')).toBe("200px");
-          }));
-
-
-          it("should animate for the highest duration",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-              var style = '-webkit-transition:1s linear all 2s;' +
-                                  'transition:1s linear all 2s;' +
-                          '-webkit-animation:my_ani 10s 1s;' +
-                                  'animation:my_ani 10s 1s;';
-
-              ss.addRule('.ng-hide-add', style);
-              ss.addRule('.ng-hide-remove', style);
-
-              element = $compile(html('<div>foo</div>'))($rootScope);
-
-              element.addClass('ng-hide');
-              expect(element).toBeHidden();
-
-              $animate.removeClass(element, 'ng-hide');
-              $rootScope.$digest();
-              if ($sniffer.transitions) {
-                $animate.triggerReflow();
-              }
-              expect(element).toBeShown();
-              if ($sniffer.transitions) {
-                expect(element.hasClass('ng-hide-remove-active')).toBe(true);
-                browserTrigger(element,'animationend', { timeStamp: Date.now() + 11000, elapsedTime: 11 });
-                expect(element.hasClass('ng-hide-remove-active')).toBe(false);
-              }
-            })
-          );
-
-
-          it("should finish the previous transition when a new animation is started",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-              var style = '-webkit-transition: 1s linear all;' +
-                                  'transition: 1s linear all;';
-
-              ss.addRule('.ng-hide-add', style);
-              ss.addRule('.ng-hide-remove', style);
-
-              element = $compile(html('<div>1</div>'))($rootScope);
-
-              element.addClass('ng-hide');
-              $animate.removeClass(element, 'ng-hide');
-              $rootScope.$digest();
-
-              if ($sniffer.transitions) {
-                $animate.triggerReflow();
-                expect(element.hasClass('ng-hide-remove')).toBe(true);
-                expect(element.hasClass('ng-hide-remove-active')).toBe(true);
-                browserTrigger(element,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-              }
-              expect(element.hasClass('ng-hide-remove')).toBe(false);
-              expect(element.hasClass('ng-hide-remove-active')).toBe(false);
-              expect(element).toBeShown();
-
-              $animate.addClass(element, 'ng-hide');
-              $rootScope.$digest();
-
-              if ($sniffer.transitions) {
-                $animate.triggerReflow();
-                expect(element.hasClass('ng-hide-add')).toBe(true);
-                expect(element.hasClass('ng-hide-add-active')).toBe(true);
-              }
-            })
-          );
-
-          it("should place a hard block when a structural CSS transition is run",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-            if (!$sniffer.transitions) return;
-
-            ss.addRule('.leave-animation.ng-leave',
-              '-webkit-transition:5s linear all;' +
-                      'transition:5s linear all;' +
-                      'opacity:1;');
-
-            ss.addRule('.leave-animation.ng-leave.ng-leave-active', 'opacity:1');
-
-            element = $compile(html('<div class="leave-animation">1</div>'))($rootScope);
-
-            $animate.leave(element);
-            $rootScope.$digest();
-
-            expect(element.attr('style')).toMatch(/transition.*?:\s*none/);
-
-            $animate.triggerReflow();
-
-            expect(element.attr('style')).not.toMatch(/transition.*?:\s*none/);
-          }));
-
-          it("should not place a hard block when a class-based CSS transition is run",
-            inject(function($animate, $rootScope, $compile, $sniffer) {
-
-            if (!$sniffer.transitions) return;
-
-            ss.addRule('.my-class', '-webkit-transition:5s linear all;' +
-                                    'transition:5s linear all;');
-
-            element = $compile(html('<div>1</div>'))($rootScope);
-
-            $animate.addClass(element, 'my-class');
-            $rootScope.$digest();
-
-            expect(element.attr('style')).not.toMatch(/transition.*?:\s*none/);
-            expect(element.hasClass('my-class')).toBe(false);
-            expect(element.hasClass('my-class-add')).toBe(true);
-
-            $animate.triggerReflow();
-            $rootScope.$digest();
-
-            expect(element.attr('style')).not.toMatch(/transition.*?:\s*none/);
-            expect(element.hasClass('my-class')).toBe(true);
-            expect(element.hasClass('my-class-add')).toBe(true);
-            expect(element.hasClass('my-class-add-active')).toBe(true);
-          }));
-
-          it("should stagger the items when the correct CSS class is provided",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout, $document, $rootElement, $browser) {
-
-            if (!$sniffer.transitions) return;
-
-            $animate.enabled(true);
-
-            ss.addRule('.real-animation.ng-enter, .real-animation.ng-leave, .real-animation-fake.ng-enter, .real-animation-fake.ng-leave',
-              '-webkit-transition:1s linear all;' +
-              'transition:1s linear all;');
-
-            ss.addRule('.real-animation.ng-enter-stagger, .real-animation.ng-leave-stagger',
-              '-webkit-transition-delay:0.1s;' +
-              '-webkit-transition-duration:0s;' +
-              'transition-delay:0.1s;' +
-              'transition-duration:0s;');
-
-            ss.addRule('.fake-animation.ng-enter-stagger, .fake-animation.ng-leave-stagger',
-              '-webkit-transition-delay:0.1s;' +
-              '-webkit-transition-duration:1s;' +
-              'transition-delay:0.1s;' +
-              'transition-duration:1s;');
-
-            var container = $compile(html('<div></div>'))($rootScope);
-
-            var newScope, element, elements = [];
-            for (var i = 0; i < 5; i++) {
-              newScope = $rootScope.$new();
-              element = $compile('<div class="real-animation"></div>')(newScope);
-              $animate.enter(element, container);
-              elements.push(element);
-            }
-
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect($browser.deferredFns.length).toEqual(5); //4 staggers + 1 combined timeout
-            $timeout.flush();
-
-            for (i = 0; i < 5; i++) {
-              dealoc(elements[i]);
-              newScope = $rootScope.$new();
-              element = $compile('<div class="fake-animation"></div>')(newScope);
-              $animate.enter(element, container);
-              elements[i] = element;
-            }
-
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            expect($browser.deferredFns.length).toEqual(0); //no animation was triggered
-          }));
-
-
-          it("should stagger items when multiple transition durations/delays are defined",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout, $document, $rootElement, $window) {
-
-            if (!$sniffer.transitions) return;
-
-            $animate.enabled(true);
-
-            ss.addRule('.stagger-animation.ng-enter, .ani.ng-leave',
-              '-webkit-transition:1s linear color 2s, 3s linear font-size 4s;' +
-              'transition:1s linear color 2s, 3s linear font-size 4s;');
-
-            ss.addRule('.stagger-animation.ng-enter-stagger, .ani.ng-leave-stagger',
-              '-webkit-transition-delay:0.1s;' +
-              'transition-delay:0.1s;');
-
-            var container = $compile(html('<div></div>'))($rootScope);
-
-            var elements = [];
-            for (var i = 0; i < 4; i++) {
-              var newScope = $rootScope.$new();
-              var element = $compile('<div class="stagger-animation"></div>')(newScope);
-              $animate.enter(element, container);
-              elements.push(element);
-            }
-
-            $rootScope.$digest();
-            $animate.triggerReflow();
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i]).not.toHaveClass('ng-enter-active');
-              expect(elements[i]).toHaveClass('ng-enter-pending');
-              expect(getMaxValue('transitionDelay', elements[i], $window)).toBe(4);
-            }
-
-            $timeout.flush(300);
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i]).toHaveClass('ng-enter-active');
-              expect(elements[i]).not.toHaveClass('ng-enter-pending');
-              expect(getMaxValue('transitionDelay', elements[i], $window)).toBe(4);
-            }
-          }));
-
-          it("should stagger items, apply directive styles but not apply a transition style when the stagger step kicks in",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout, $document, $rootElement, $window) {
-
-            if (!$sniffer.transitions) return;
-
-            $animate.enabled(true);
-
-            ss.addRule('.stagger-animation.ng-enter, .ani.ng-leave',
-              '-webkit-transition:1s linear color 2s, 3s linear font-size 4s;' +
-              'transition:1s linear color 2s, 3s linear font-size 4s;');
-
-            ss.addRule('.stagger-animation.ng-enter-stagger, .ani.ng-leave-stagger',
-              '-webkit-transition-delay:0.1s;' +
-              'transition-delay:0.1s;');
-
-            var styles = {
-              from: { left: '155px' },
-              to: { left: '255px' }
-            };
-            var container = $compile(html('<div></div>'))($rootScope);
-
-            var elements = [];
-            for (var i = 0; i < 4; i++) {
-              var newScope = $rootScope.$new();
-              var element = $compile('<div class="stagger-animation"></div>')(newScope);
-              $animate.enter(element, container, null, styles);
-              elements.push(element);
-            }
-
-            $rootScope.$digest();
-
-            for (i = 0; i < 4; i++) {
-              expect(elements[i]).toHaveClass('ng-enter');
-              assertLeftStyle(elements[i], '155');
-            }
-
-            $animate.triggerReflow();
-
-            expect(elements[0]).toHaveClass('ng-enter-active');
-            assertLeftStyle(elements[0], '255');
-            assertNoTransitionDuration(elements[0]);
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i]).not.toHaveClass('ng-enter-active');
-              assertLeftStyle(elements[i], '255', true);
-            }
-
-            $timeout.flush(300);
-
-            for (i = 1; i < 4; i++) {
-              expect(elements[i]).toHaveClass('ng-enter-active');
-              assertNoTransitionDuration(elements[i]);
-              assertLeftStyle(elements[i], '255');
-            }
-
-            $timeout.flush();
-
-            for (i = 0; i < 4; i++) {
-              expect(elements[i]).not.toHaveClass('ng-enter');
-              expect(elements[i]).not.toHaveClass('ng-enter-active');
-              assertNoTransitionDuration(elements[i]);
-              assertLeftStyle(elements[i], '255');
-            }
-
-            function assertLeftStyle(element, val, not) {
-              var regex = new RegExp('left: ' + val + 'px');
-              var style = element.attr('style');
-              not ? expect(style).not.toMatch(regex)
-                  : expect(style).toMatch(regex);
-            }
-
-            function assertNoTransitionDuration(element) {
-              var style = element.attr('style');
-              expect(style).not.toMatch(/transition/);
-            }
-          }));
-
-          it("should apply a closing timeout to close all pending transitions",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
-
-            if (!$sniffer.transitions) return;
-
-            ss.addRule('.animated-element', '-webkit-transition:5s linear all;' +
-                                                    'transition:5s linear all;');
-
-            element = $compile(html('<div class="animated-element">foo</div>'))($rootScope);
-
-            $animate.addClass(element, 'some-class');
-            $rootScope.$digest();
-
-            $animate.triggerReflow(); //reflow
-            expect(element.hasClass('some-class-add-active')).toBe(true);
-
-            $timeout.flush(7500); //closing timeout
-            expect(element.hasClass('some-class-add-active')).toBe(false);
-          }));
-
-          it("should intelligently cancel former timeouts and close off a series of elements a final timeout", function() {
-            var currentTimestamp, cancellations = 0;
-            module(function($provide) {
-              $provide.decorator('$timeout', function($delegate) {
-                var _cancel = $delegate.cancel;
-                $delegate.cancel = function(timer) {
-                  if (timer) {
-                    cancellations++;
-                    return _cancel.apply($delegate, arguments);
-                  }
-                };
-                return $delegate;
-              });
-
-              return function($sniffer) {
-                if ($sniffer.transitions) {
-                  currentTimestamp = Date.now();
-                  spyOn(Date,'now').andCallFake(function() {
-                    return currentTimestamp;
-                  });
-                }
-              };
-            });
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
-              if (!$sniffer.transitions) return;
-
-              ss.addRule('.animate-me div', '-webkit-transition:1s linear all;' +
-                                                      'transition:1s linear all;');
-
-              ss.addRule('.animate-me-longer div', '-webkit-transition:1.5s linear all;' +
-                                                       'transition:1.5s linear all;');
-
-              element = $compile(html('<div class="animate-me-longer">' +
-                                      '  <div ng-repeat="item in items"></div>' +
-                                      '</div>'))($rootScope);
-              $rootScope.items = [0];
-              $rootScope.$digest();
-              $animate.triggerReflow();
-
-              currentTimestamp += 2250; //1.5 * 1500 = 2250
-
-              element[0].className = 'animate-me';
-
-              $rootScope.items = [1,2,3,4,5,6,7,8,9,10];
-
-              $rootScope.$digest();
-
-              $rootScope.items = [0];
-              $animate.triggerReflow();
-
-              currentTimestamp += 1500; //1.5 * 1000 = 1500
-              $timeout.flush(1500);
-
-              expect(cancellations).toBe(1);
-              expect(element.children().length).toBe(10);
-              cancellations = 0;
-
-              $rootScope.items = [1];
-              $rootScope.$digest();
-
-              $animate.triggerReflow();
-              $timeout.flush(1500);
-              expect(element.children().length).toBe(1);
-              expect(cancellations).toBe(1);
-            });
-          });
-
-          it('should apply a closing timeout to close all parallel class-based animations on the same element',
-            inject(function($sniffer, $compile, $rootScope, $rootElement, $animate, $timeout) {
-
-            if (!$sniffer.transitions) return;
-
-            ss.addRule('.base-class', '-webkit-transition:2s linear all;' +
-                                              'transition:2s linear all;');
-
-            var element = $compile('<div class="base-class"></div>')($rootScope);
-            $rootElement.append(element);
-            jqLite($document[0].body).append($rootElement);
-
-            $animate.addClass(element, 'one');
-            $animate.addClass(element, 'two');
-
-            $animate.triggerReflow();
-
-            $timeout.flush(3000); //2s * 1.5
-
-            expect(element.hasClass('one-add')).toBeFalsy();
-            expect(element.hasClass('one-add-active')).toBeFalsy();
-            expect(element.hasClass('two-add')).toBeFalsy();
-            expect(element.hasClass('two-add-active')).toBeFalsy();
-            expect(element.hasClass('ng-animate')).toBeFalsy();
-          }));
-
-          it("apply a closing timeout with respect to a staggering animation",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
-
-            if (!$sniffer.transitions) return;
-
-            ss.addRule('.entering-element.ng-enter',
-              '-webkit-transition:5s linear all;' +
-                      'transition:5s linear all;');
-
-            ss.addRule('.entering-element.ng-enter-stagger',
-              '-webkit-transition-delay:0.5s;' +
-                      'transition-delay:0.5s;');
-
-            element = $compile(html('<div></div>'))($rootScope);
-            var kids = [];
-            for (var i = 0; i < 5; i++) {
-              kids.push(angular.element('<div class="entering-element"></div>'));
-              $animate.enter(kids[i], element);
-            }
-            $rootScope.$digest();
-
-            $animate.triggerReflow(); //reflow
-            expect(element.children().length).toBe(5);
-
-            for (i = 1; i < 5; i++) {
-              expect(kids[i]).not.toHaveClass('ng-enter-active');
-              expect(kids[i]).toHaveClass('ng-enter-pending');
-            }
-
-            $timeout.flush(2000);
-
-            for (i = 1; i < 5; i++) {
-              expect(kids[i]).toHaveClass('ng-enter-active');
-              expect(kids[i]).not.toHaveClass('ng-enter-pending');
-            }
-
-            //(stagger * index) + (duration + delay) * 150%
-            //0.5 * 4 + 5 * 1.5 = 9500;
-            //9500 - 2000 - 7499 = 1
-            $timeout.flush(7499);
-
-            for (i = 0; i < 5; i++) {
-              expect(kids[i].hasClass('ng-enter-active')).toBe(true);
-            }
-
-            $timeout.flush(1); //up to 2000ms
-
-            for (i = 0; i < 5; i++) {
-              expect(kids[i].hasClass('ng-enter-active')).toBe(false);
-            }
-          }));
-
-          it("should cancel all the existing stagger timers when the animation is cancelled",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout, $browser) {
-
-            if (!$sniffer.transitions) return;
-
-            ss.addRule('.entering-element.ng-enter',
-              '-webkit-transition:5s linear all;' +
-                      'transition:5s linear all;');
-
-            ss.addRule('.entering-element.ng-enter-stagger',
-              '-webkit-transition-delay:1s;' +
-                      'transition-delay:1s;');
-
-            var cancellations = [];
-            element = $compile(html('<div></div>'))($rootScope);
-            var kids = [];
-            for (var i = 0; i < 5; i++) {
-              kids.push(angular.element('<div class="entering-element"></div>'));
-              cancellations.push($animate.enter(kids[i], element));
-            }
-            $rootScope.$digest();
-
-            $animate.triggerReflow(); //reflow
-            expect(element.children().length).toBe(5);
-
-            for (i = 1; i < 5; i++) {
-              expect(kids[i]).not.toHaveClass('ng-enter-active');
-              expect(kids[i]).toHaveClass('ng-enter-pending');
-            }
-
-            expect($browser.deferredFns.length).toEqual(5); //4 staggers + 1 combined timeout
-
-            forEach(cancellations, function(promise) {
-              $animate.cancel(promise);
-            });
-
-            for (i = 1; i < 5; i++) {
-              expect(kids[i]).not.toHaveClass('ng-enter');
-              expect(kids[i]).not.toHaveClass('ng-enter-active');
-              expect(kids[i]).not.toHaveClass('ng-enter-pending');
-            }
-
-            //the staggers are gone, but the global timeout remains
-            expect($browser.deferredFns.length).toEqual(1);
-          }));
-
-
-          it("should not allow the closing animation to close off a successive animation midway",
-            inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
-
-            if (!$sniffer.transitions) return;
-
-            ss.addRule('.some-class-add', '-webkit-transition:5s linear all;' +
-                                                  'transition:5s linear all;');
-            ss.addRule('.some-class-remove', '-webkit-transition:10s linear all;' +
-                                                     'transition:10s linear all;');
-
-            element = $compile(html('<div>foo</div>'))($rootScope);
-
-            $animate.addClass(element, 'some-class');
-            $rootScope.$digest();
-
-            $animate.triggerReflow(); //reflow
-            expect(element.hasClass('some-class-add-active')).toBe(true);
-
-            $animate.removeClass(element, 'some-class');
-            $rootScope.$digest();
-
-            $animate.triggerReflow(); //second reflow
-
-            $timeout.flush(7500); //closing timeout for the first animation
-            expect(element.hasClass('some-class-remove-active')).toBe(true);
-
-            $timeout.flush(15000); //closing timeout for the second animation
-            expect(element.hasClass('some-class-remove-active')).toBe(false);
-
-            $timeout.verifyNoPendingTasks();
-          }));
-        });
-
-
-        it("should apply staggering to both transitions and keyframe animations when used within the same animation",
-          inject(function($animate, $rootScope, $compile, $sniffer, $timeout, $document, $rootElement, $browser) {
-
-          if (!$sniffer.transitions) return;
-
-          $animate.enabled(true);
-
-          ss.addRule('.stagger-animation.ng-enter, .stagger-animation.ng-leave',
-            '-webkit-animation:my_animation 1s 1s, your_animation 1s 2s;' +
-            'animation:my_animation 1s 1s, your_animation 1s 2s;' +
-            '-webkit-transition:1s linear all 1s;' +
-            'transition:1s linear all 1s;');
-
-          ss.addRule('.stagger-animation.ng-enter-stagger, .stagger-animation.ng-leave-stagger',
-            '-webkit-transition-delay:0.1s;' +
-            'transition-delay:0.1s;' +
-            '-webkit-animation-delay:0.2s;' +
-            'animation-delay:0.2s;');
-
-          var container = $compile(html('<div></div>'))($rootScope);
-
-          var elements = [];
-          for (var i = 0; i < 3; i++) {
-            var newScope = $rootScope.$new();
-            var element = $compile('<div class="stagger-animation"></div>')(newScope);
-            $animate.enter(element, container);
-            elements.push(element);
-          }
-
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          expect($browser.deferredFns.length).toEqual(3); //2 staggers + 1 combined timeout
-
-          expect(elements[0].attr('style')).toBeFalsy();
-          expect(elements[1].attr('style')).toMatch(/animation-play-state:\s*paused/);
-          expect(elements[2].attr('style')).toMatch(/animation-play-state:\s*paused/);
-
-          for (i = 1; i < 3; i++) {
-            expect(elements[i]).not.toHaveClass('ng-enter-active');
-            expect(elements[i]).toHaveClass('ng-enter-pending');
-          }
-
-          $timeout.flush(0.4 * 1000);
-
-          for (i = 1; i < 3; i++) {
-            expect(elements[i]).toHaveClass('ng-enter-active');
-            expect(elements[i]).not.toHaveClass('ng-enter-pending');
-          }
-
-          for (i = 0; i < 3; i++) {
-            browserTrigger(elements[i],'transitionend', { timeStamp: Date.now() + 22000, elapsedTime: 22000 });
-            expect(elements[i].attr('style')).toBeFalsy();
-          }
-        }));
-
-        it("should create a piggy-back-transition which has a duration the same as the max keyframe duration if any directive styles are provided",
-          inject(function($compile, $animate, $rootScope, $sniffer) {
-
-          $animate.enabled(true);
-          ss.addRule('.on', '-webkit-transition: 1s linear all; transition: 1s linear all;');
-
-          element = $compile(html('<div>1</div>'))($rootScope);
-
-          $animate.addClass(element, 'on', {
-            to: {color: 'red'}
-          });
-
-          $rootScope.$digest();
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(element.attr('style')).toContain('color: red');
-            expect(element.attr('style')).not.toContain('transition');
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-
-          expect(element.attr('style')).toContain('color: red');
-        }));
-      });
-
-
-      describe('animation evaluation', function() {
-
-        it('should re-evaluate the CSS classes for an animation each time',
-          inject(function($animate, $rootScope, $sniffer, $rootElement, $timeout, $compile) {
-
-          ss.addRule('.abc.ng-enter', '-webkit-transition:22s linear all;' +
-                                      'transition:22s linear all;');
-          ss.addRule('.xyz.ng-enter', '-webkit-transition:11s linear all;' +
-                                      'transition:11s linear all;');
-
-          var parent = $compile('<div><span ng-class="klass"></span></div>')($rootScope);
-          var element = parent.find('span');
-          $rootElement.append(parent);
-          angular.element(document.body).append($rootElement);
-
-          $rootScope.klass = 'abc';
-          $animate.enter(element, parent);
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(element.hasClass('abc')).toBe(true);
-            expect(element.hasClass('ng-enter')).toBe(true);
-            expect(element.hasClass('ng-enter-active')).toBe(true);
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 22000, elapsedTime: 22 });
-            $animate.triggerCallbackPromise();
-          }
-          expect(element.hasClass('abc')).toBe(true);
-
-          $rootScope.klass = 'xyz';
-          $animate.enter(element, parent);
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(element.hasClass('xyz')).toBe(true);
-            expect(element.hasClass('ng-enter')).toBe(true);
-            expect(element.hasClass('ng-enter-active')).toBe(true);
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 11000, elapsedTime: 11 });
-            $animate.triggerCallbackPromise();
-          }
-          expect(element.hasClass('xyz')).toBe(true);
-        }));
-
-
-        it('should only append active to the newly append CSS className values',
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          ss.addRule('.ng-enter', '-webkit-transition:9s linear all;' +
-                                          'transition:9s linear all;');
-
-          var parent = jqLite('<div><span></span></div>');
-          var element = parent.find('span');
-          $rootElement.append(parent);
-          angular.element(document.body).append($rootElement);
-
-          element.attr('class','one two');
-
-          $animate.enter(element, parent);
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(element.hasClass('one')).toBe(true);
-            expect(element.hasClass('two')).toBe(true);
-            expect(element.hasClass('ng-enter')).toBe(true);
-            expect(element.hasClass('ng-enter-active')).toBe(true);
-            expect(element.hasClass('one-active')).toBe(false);
-            expect(element.hasClass('two-active')).toBe(false);
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 3000, elapsedTime: 3 });
-          }
-
-          expect(element.hasClass('one')).toBe(true);
-          expect(element.hasClass('two')).toBe(true);
-        }));
-      });
-
-
-      describe("Callbacks", function() {
-
-        beforeEach(function() {
-          module(function($animateProvider) {
-            $animateProvider.register('.custom', function($timeout) {
-              return {
-                removeClass: function(element, className, done) {
-                  $timeout(done, 2000);
-                }
-              };
-            });
-            $animateProvider.register('.other', function($timeout) {
-              return {
-                enter: function(element, done) {
-                  $timeout(done, 10000);
-                }
-              };
-            });
-          });
-        });
-
-
-        it("should fire the enter callback",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span></span></div>');
-          var element = parent.find('span');
-          $rootElement.append(parent);
-          body.append($rootElement);
-
-          var flag = false;
-          $animate.enter(element, parent, null).then(function() {
-            flag = true;
-          });
-          $rootScope.$digest();
-
-          $animate.triggerCallbackPromise();
-
-          expect(flag).toBe(true);
-        }));
-
-
-        it("should fire the leave callback",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span></span></div>');
-          var element = parent.find('span');
-          $rootElement.append(parent);
-          body.append($rootElement);
-
-          var flag = false;
-          $animate.leave(element).then(function() {
-            flag = true;
-          });
-          $rootScope.$digest();
-
-          $animate.triggerCallbackPromise();
-
-          expect(flag).toBe(true);
-        }));
-
-
-        it("should fire the move callback",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span></span></div>');
-          var parent2 = jqLite('<div id="nice"></div>');
-          var element = parent.find('span');
-          $rootElement.append(parent);
-          body.append($rootElement);
-
-          var flag = false;
-          $animate.move(element, parent, parent2).then(function() {
-            flag = true;
-          });
-          $rootScope.$digest();
-
-          $animate.triggerCallbackPromise();
-
-          expect(flag).toBe(true);
-          expect(element.parent().id).toBe(parent2.id);
-
-          dealoc(element);
-        }));
-
-
-        it("should fire the addClass/removeClass callbacks",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span></span></div>');
-          var element = parent.find('span');
-          $rootElement.append(parent);
-          body.append($rootElement);
-
-          var signature = '';
-          $animate.addClass(element, 'on').then(function() {
-            signature += 'A';
-          });
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          $animate.removeClass(element, 'on').then(function() {
-            signature += 'B';
-          });
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          $animate.triggerCallbackPromise();
-
-          expect(signature).toBe('AB');
-        }));
-
-        it("should fire the setClass callback",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span class="off"></span></div>');
-          var element = parent.find('span');
-          $rootElement.append(parent);
-          body.append($rootElement);
-
-          expect(element.hasClass('on')).toBe(false);
-          expect(element.hasClass('off')).toBe(true);
-
-          var signature = '';
-          $animate.setClass(element, 'on', 'off').then(function() {
-            signature += 'Z';
-          });
-          $rootScope.$digest();
-
-          $animate.triggerReflow();
-          $animate.triggerCallbackPromise();
-
-          expect(signature).toBe('Z');
-          expect(element.hasClass('on')).toBe(true);
-          expect(element.hasClass('off')).toBe(false);
-        }));
-
-        it('should fire DOM callbacks on the element being animated',
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          if (!$sniffer.transitions) return;
-
-          $animate.enabled(true);
-
-          ss.addRule('.klass-add', '-webkit-transition:1s linear all;' +
-                                           'transition:1s linear all;');
-
-          var element = jqLite('<div></div>');
-          $rootElement.append(element);
-          body.append($rootElement);
-
-          var steps = [];
-          element.on('$animate:before', function(e, data) {
-            steps.push(['before', data.className, data.event]);
-          });
-
-          element.on('$animate:after', function(e, data) {
-            steps.push(['after', data.className, data.event]);
-          });
-
-          element.on('$animate:close', function(e, data) {
-            steps.push(['close', data.className, data.event]);
-          });
-
-          $animate.addClass(element, 'klass').then(function() {
-            steps.push(['done', 'klass', 'addClass']);
-          });
-          $rootScope.$digest();
-
-          $animate.triggerCallbackEvents();
-
-          expect(steps.pop()).toEqual(['before', 'klass', 'addClass']);
-
-          $animate.triggerReflow();
-
-          $animate.triggerCallbackEvents();
-
-          expect(steps.pop()).toEqual(['after', 'klass', 'addClass']);
-
-          browserTrigger(element,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-
-          $animate.triggerCallbackEvents();
-
-          expect(steps.shift()).toEqual(['close', 'klass', 'addClass']);
-
-          $animate.triggerCallbackPromise();
-
-          expect(steps.shift()).toEqual(['done', 'klass', 'addClass']);
-        }));
-
-        it('should fire the DOM callbacks even if no animation is rendered',
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          $animate.enabled(true);
-
-          var parent = jqLite('<div></div>');
-          var element = jqLite('<div></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-
-          var steps = [];
-          element.on('$animate:before', function(e, data) {
-            steps.push(['before', data.className, data.event]);
-          });
-
-          element.on('$animate:after', function(e, data) {
-            steps.push(['after', data.className, data.event]);
-          });
-
-          $animate.enter(element, parent);
-          $rootScope.$digest();
-
-          $animate.triggerCallbackEvents();
-
-          expect(steps.shift()).toEqual(['before', 'ng-enter', 'enter']);
-          expect(steps.shift()).toEqual(['after',  'ng-enter', 'enter']);
-        }));
-
-        it('should not fire DOM callbacks on the element being animated unless registered',
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement, $timeout) {
-
-          $animate.enabled(true);
-
-          var element = jqLite('<div></div>');
-          $rootElement.append(element);
-          body.append($rootElement);
-
-          $animate.addClass(element, 'class');
-          $rootScope.$digest();
-
-          $timeout.verifyNoPendingTasks();
-        }));
-
-        it("should fire a done callback when provided with no animation",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span></span></div>');
-          var element = parent.find('span');
-          $rootElement.append(parent);
-          body.append($rootElement);
-
-          var flag = false;
-          $animate.removeClass(element, 'ng-hide').then(function() {
-            flag = true;
-          });
-          $rootScope.$digest();
-
-          $animate.triggerCallbackPromise();
-          expect(flag).toBe(true);
-        }));
-
-
-        it("should fire a done callback when provided with a css animation/transition",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          ss.addRule('.ng-hide-add', '-webkit-transition:1s linear all;' +
-                                             'transition:1s linear all;');
-          ss.addRule('.ng-hide-remove', '-webkit-transition:1s linear all;' +
-                                                'transition:1s linear all;');
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = parent.find('span');
-
-          var flag = false;
-          $animate.addClass(element, 'ng-hide').then(function() {
-            flag = true;
-          });
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-          }
-          $animate.triggerCallbackPromise();
-          expect(flag).toBe(true);
-        }));
-
-
-        it("should fire a done callback when provided with a JS animation",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = parent.find('span');
-          element.addClass('custom');
-
-          var flag = false;
-          $animate.removeClass(element, 'ng-hide').then(function() {
-            flag = true;
-          });
-          $rootScope.$digest();
-
-          $animate.triggerCallbackPromise();
-          expect(flag).toBe(true);
-        }));
-
-
-        it("should fire the callback right away if another animation is called right after",
-          inject(function($animate, $rootScope, $compile, $sniffer, $rootElement) {
-
-          ss.addRule('.ng-hide-add', '-webkit-transition:9s linear all;' +
-                                             'transition:9s linear all;');
-          ss.addRule('.ng-hide-remove', '-webkit-transition:9s linear all;' +
-                                                'transition:9s linear all;');
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = parent.find('span');
-
-          var signature = '';
-          $animate.removeClass(element, 'ng-hide').then(function() {
-            signature += 'A';
-          });
-          $rootScope.$digest();
-          $animate.addClass(element, 'ng-hide').then(function() {
-            signature += 'B';
-          });
-          $rootScope.$digest();
-
-          $animate.addClass(element, 'ng-hide'); //earlier animation cancelled
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 9 });
-          }
-          $animate.triggerCallbackPromise();
-          expect(signature).toBe('AB');
-        }));
-      });
-
-      describe("options", function() {
-
-        it('should add and remove the temporary className value is provided', function() {
-          var captures = {};
-          module(function($animateProvider) {
-            $animateProvider.register('.capture', function() {
-              return {
-                enter: capture('enter'),
-                leave: capture('leave'),
-                move: capture('move'),
-                addClass: capture('addClass'),
-                removeClass: capture('removeClass'),
-                setClass: capture('setClass')
-              };
-
-              function capture(event) {
-                return function(element, add, remove, styles, done) {
-                  //some animations only have one extra param
-                  done = arguments[arguments.length - 2]; //the last one is the styles array
-                  captures[event]=done;
-                };
-              }
-            });
-          });
-          inject(function($animate, $rootScope, $compile, $rootElement, $document) {
-            var container = jqLite('<div class="container"></div>');
-            var container2 = jqLite('<div class="container2"></div>');
-            var element = jqLite('<div class="capture"></div>');
-            $rootElement.append(container);
-            $rootElement.append(container2);
-            angular.element($document[0].body).append($rootElement);
-
-            $compile(element)($rootScope);
-
-            assertTempClass('enter', 'temp-enter', function() {
-              $animate.enter(element, container, null, {
-                tempClasses: 'temp-enter'
-              });
-            });
-
-            assertTempClass('move', 'temp-move', function() {
-              $animate.move(element, null, container2, {
-                tempClasses: 'temp-move'
-              });
-            });
-
-            assertTempClass('addClass', 'temp-add', function() {
-              $animate.addClass(element, 'add', {
-                tempClasses: 'temp-add'
-              });
-            });
-
-            assertTempClass('removeClass', 'temp-remove', function() {
-              $animate.removeClass(element, 'add', {
-                tempClasses: 'temp-remove'
-              });
-            });
-
-            element.addClass('remove');
-            assertTempClass('setClass', 'temp-set', function() {
-              $animate.setClass(element, 'add', 'remove', {
-                tempClasses: 'temp-set'
-              });
-            });
-
-            assertTempClass('leave', 'temp-leave', function() {
-              $animate.leave(element, {
-                tempClasses: 'temp-leave'
-              });
-            });
-
-            function assertTempClass(event, className, animationOperation) {
-              expect(element).not.toHaveClass(className);
-              animationOperation();
-              $rootScope.$digest();
-              expect(element).toHaveClass(className);
-              $animate.triggerReflow();
-              captures[event]();
-              $animate.triggerCallbacks();
-              expect(element).not.toHaveClass(className);
-            }
-          });
-        });
-      });
-
-      describe("addClass / removeClass", function() {
-
-        var captured;
-        beforeEach(function() {
-          module(function($animateProvider) {
-            $animateProvider.register('.klassy', function($timeout) {
-              return {
-                addClass: function(element, className, done) {
-                  captured = 'addClass-' + className;
-                  $timeout(done, 500, false);
-                },
-                removeClass: function(element, className, done) {
-                  captured = 'removeClass-' + className;
-                  $timeout(done, 3000, false);
-                }
-              };
-            });
-          });
-        });
-
-
-        it("should not perform an animation, and the followup DOM operation, if the class is " +
-           "already present during addClass or not present during removeClass on the element",
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          var element = jqLite('<div class="klassy"></div>');
-          $rootElement.append(element);
-          body.append($rootElement);
-
-          //skipped animations
-          captured = 'none';
-          $animate.removeClass(element, 'some-class');
-          $rootScope.$digest();
-          expect(element.hasClass('some-class')).toBe(false);
-          expect(captured).toBe('none');
-
-          element.addClass('some-class');
-
-          captured = 'nothing';
-          $animate.addClass(element, 'some-class');
-          $rootScope.$digest();
-          expect(captured).toBe('nothing');
-          expect(element.hasClass('some-class')).toBe(true);
-
-          //actual animations
-          captured = 'none';
-          $animate.removeClass(element, 'some-class');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          expect(element.hasClass('some-class')).toBe(false);
-          expect(captured).toBe('removeClass-some-class');
-
-          captured = 'nothing';
-          $animate.addClass(element, 'some-class');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          expect(element.hasClass('some-class')).toBe(true);
-          expect(captured).toBe('addClass-some-class');
-        }));
-
-        it("should perform the animation if passed native dom element",
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          var element = jqLite('<div class="klassy"></div>');
-          $rootElement.append(element);
-          body.append($rootElement);
-
-          //skipped animations
-          captured = 'none';
-          $animate.removeClass(element[0], 'some-class');
-          $rootScope.$digest();
-          expect(element.hasClass('some-class')).toBe(false);
-          expect(captured).toBe('none');
-
-          element.addClass('some-class');
-
-          captured = 'nothing';
-          $animate.addClass(element[0], 'some-class');
-          $rootScope.$digest();
-          expect(captured).toBe('nothing');
-          expect(element.hasClass('some-class')).toBe(true);
-
-          //actual animations
-          captured = 'none';
-          $animate.removeClass(element[0], 'some-class');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          expect(element.hasClass('some-class')).toBe(false);
-          expect(captured).toBe('removeClass-some-class');
-
-          captured = 'nothing';
-          $animate.addClass(element[0], 'some-class');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          expect(element.hasClass('some-class')).toBe(true);
-          expect(captured).toBe('addClass-some-class');
-        }));
-
-        it("should add and remove CSS classes after an animation even if no animation is present",
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = jqLite(parent.find('span'));
-
-          $animate.addClass(element,'klass');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          expect(element.hasClass('klass')).toBe(true);
-
-          $animate.removeClass(element,'klass');
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          expect(element.hasClass('klass')).toBe(false);
-          expect(element.hasClass('klass-remove')).toBe(false);
-          expect(element.hasClass('klass-remove-active')).toBe(false);
-        }));
-
-
-        it("should add and remove CSS classes with a callback",
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = jqLite(parent.find('span'));
-
-          var signature = '';
-
-          $animate.addClass(element,'klass').then(function() {
-            signature += 'A';
-          });
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          expect(element.hasClass('klass')).toBe(true);
-
-          $animate.removeClass(element,'klass').then(function() {
-            signature += 'B';
-          });
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          $animate.triggerCallbackPromise();
-          expect(element.hasClass('klass')).toBe(false);
-          expect(signature).toBe('AB');
-        }));
-
-
-        it("should end the current addClass animation, add the CSS class and then run the removeClass animation",
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          ss.addRule('.klass-add', '-webkit-transition:3s linear all;' +
-                                           'transition:3s linear all;');
-          ss.addRule('.klass-remove', '-webkit-transition:3s linear all;' +
-                                              'transition:3s linear all;');
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = jqLite(parent.find('span'));
-
-          var signature = '';
-
-          $animate.addClass(element,'klass').then(function() {
-            signature += '1';
-          });
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            expect(element.hasClass('klass-add')).toBe(true);
-            $animate.triggerReflow();
-            expect(element.hasClass('klass')).toBe(true);
-            expect(element.hasClass('klass-add-active')).toBe(true);
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 3000, elapsedTime: 3 });
-          }
-
-          $animate.triggerCallbackPromise();
-
-          //this cancels out the older animation
-          $animate.removeClass(element,'klass').then(function() {
-            signature += '2';
-          });
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            expect(element.hasClass('klass-remove')).toBe(true);
-
-            $animate.triggerReflow();
-            expect(element.hasClass('klass')).toBe(false);
-            expect(element.hasClass('klass-add')).toBe(false);
-            expect(element.hasClass('klass-add-active')).toBe(false);
-
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 3000, elapsedTime: 3 });
-          }
-
-          $animate.triggerCallbackPromise();
-
-          expect(element.hasClass('klass')).toBe(false);
-          expect(signature).toBe('12');
-        }));
-
-
-        it("should properly execute JS animations and use callbacks when using addClass / removeClass",
-          inject(function($animate, $rootScope, $sniffer, $rootElement, $timeout) {
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = jqLite(parent.find('span'));
-
-          var signature = '';
-
-          $animate.addClass(element,'klassy').then(function() {
-            signature += 'X';
-          });
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          $timeout.flush(500);
-
-          expect(element.hasClass('klassy')).toBe(true);
-
-          $animate.removeClass(element,'klassy').then(function() {
-            signature += 'Y';
-          });
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          $timeout.flush(3000);
-
-          expect(element.hasClass('klassy')).toBe(false);
-
-          $animate.triggerCallbackPromise();
-          expect(signature).toBe('XY');
-        }));
-
-        it("should properly execute JS animations if passed native dom element",
-          inject(function($animate, $rootScope, $sniffer, $rootElement, $timeout) {
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = jqLite(parent.find('span'));
-
-          var signature = '';
-
-          $animate.addClass(element[0],'klassy').then(function() {
-            signature += 'X';
-          });
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          $timeout.flush(500);
-
-          expect(element.hasClass('klassy')).toBe(true);
-
-          $animate.removeClass(element[0],'klassy').then(function() {
-            signature += 'Y';
-          });
-          $rootScope.$digest();
-          $animate.triggerReflow();
-
-          $timeout.flush(3000);
-
-          expect(element.hasClass('klassy')).toBe(false);
-
-          $animate.triggerCallbackPromise();
-          expect(signature).toBe('XY');
-        }));
-
-        it("should properly execute CSS animations/transitions and use callbacks when using addClass / removeClass",
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          ss.addRule('.klass-add', '-webkit-transition:11s linear all;' +
-                                           'transition:11s linear all;');
-          ss.addRule('.klass-remove', '-webkit-transition:11s linear all;' +
-                                              'transition:11s linear all;');
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = jqLite(parent.find('span'));
-
-          var signature = '';
-
-          $animate.addClass(element,'klass').then(function() {
-            signature += 'd';
-          });
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(element.hasClass('klass-add')).toBe(true);
-            expect(element.hasClass('klass-add-active')).toBe(true);
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 11000, elapsedTime: 11 });
-            expect(element.hasClass('klass-add')).toBe(false);
-            expect(element.hasClass('klass-add-active')).toBe(false);
-          }
-
-          $animate.triggerCallbackPromise();
-          expect(element.hasClass('klass')).toBe(true);
-
-          $animate.removeClass(element,'klass').then(function() {
-            signature += 'b';
-          });
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(element.hasClass('klass-remove')).toBe(true);
-            expect(element.hasClass('klass-remove-active')).toBe(true);
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 11000, elapsedTime: 11 });
-            expect(element.hasClass('klass-remove')).toBe(false);
-            expect(element.hasClass('klass-remove-active')).toBe(false);
-          }
-
-          $animate.triggerCallbackPromise();
-          expect(element.hasClass('klass')).toBe(false);
-
-          expect(signature).toBe('db');
-        }));
-
-
-        it("should allow for multiple css classes to be animated plus a callback when added",
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          ss.addRule('.one-add', '-webkit-transition:7s linear all;' +
-                                         'transition:7s linear all;');
-          ss.addRule('.two-add', '-webkit-transition:7s linear all;' +
-                                         'transition:7s linear all;');
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = jqLite(parent.find('span'));
-
-          var flag = false;
-          $animate.addClass(element,'one two').then(function() {
-            flag = true;
-          });
-
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(element.hasClass('one-add')).toBe(true);
-            expect(element.hasClass('two-add')).toBe(true);
-
-            expect(element.hasClass('one-add-active')).toBe(true);
-            expect(element.hasClass('two-add-active')).toBe(true);
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 7000, elapsedTime: 7 });
-
-            expect(element.hasClass('one-add')).toBe(false);
-            expect(element.hasClass('one-add-active')).toBe(false);
-            expect(element.hasClass('two-add')).toBe(false);
-            expect(element.hasClass('two-add-active')).toBe(false);
-          }
-
-          $animate.triggerCallbackPromise();
-
-          expect(element.hasClass('one')).toBe(true);
-          expect(element.hasClass('two')).toBe(true);
-
-          expect(flag).toBe(true);
-        }));
-
-
-        it("should allow for multiple css classes to be animated plus a callback when removed",
-          inject(function($animate, $rootScope, $sniffer, $rootElement) {
-
-          ss.addRule('.one-remove', '-webkit-transition:9s linear all;' +
-                                            'transition:9s linear all;');
-          ss.addRule('.two-remove', '-webkit-transition:9s linear all;' +
-                                            'transition:9s linear all;');
-
-          var parent = jqLite('<div><span></span></div>');
-          $rootElement.append(parent);
-          body.append($rootElement);
-          var element = jqLite(parent.find('span'));
-
-          element.addClass('one two');
-          expect(element.hasClass('one')).toBe(true);
-          expect(element.hasClass('two')).toBe(true);
-
-          var flag = false;
-          $animate.removeClass(element,'one two').then(function() {
-            flag = true;
-          });
-          $rootScope.$digest();
-
-          if ($sniffer.transitions) {
-            $animate.triggerReflow();
-            expect(element.hasClass('one-remove')).toBe(true);
-            expect(element.hasClass('two-remove')).toBe(true);
-
-            expect(element.hasClass('one-remove-active')).toBe(true);
-            expect(element.hasClass('two-remove-active')).toBe(true);
-            browserTrigger(element,'transitionend', { timeStamp: Date.now() + 9000, elapsedTime: 9 });
+describe("animations", function() {
 
-            expect(element.hasClass('one-remove')).toBe(false);
-            expect(element.hasClass('one-remove-active')).toBe(false);
-            expect(element.hasClass('two-remove')).toBe(false);
-            expect(element.hasClass('two-remove-active')).toBe(false);
-          }
+  beforeEach(module('ngAnimate'));
 
-          $animate.triggerCallbackPromise();
+  var element, applyAnimationClasses;
+  afterEach(inject(function($$jqLite) {
+    applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+    dealoc(element);
+  }));
 
-          expect(element.hasClass('one')).toBe(false);
-          expect(element.hasClass('two')).toBe(false);
+  it('should allow animations if the application is bootstrapped on the document node', function() {
+    var capturedAnimation;
 
-          expect(flag).toBe(true);
-        }));
+    module(function($provide) {
+      $provide.factory('$rootElement', function($document) {
+        return $document;
+      });
+      $provide.factory('$$animation', function($$AnimateRunner) {
+        return function() {
+          capturedAnimation = arguments;
+          return new $$AnimateRunner();
+        };
       });
     });
 
-    var $rootElement, $document;
-    beforeEach(module(function() {
-      return function(_$rootElement_, _$document_, $animate) {
-        $rootElement = _$rootElement_;
-        $document = _$document_;
-        $animate.enabled(true);
-      };
-    }));
-
-    function html(element) {
-      var body = jqLite($document[0].body);
-      $rootElement.append(element);
-      body.append($rootElement);
-      return element;
-    }
-
-
-    it("should properly animate and parse CSS3 transitions",
-      inject(function($compile, $rootScope, $animate, $sniffer) {
-
-      ss.addRule('.ng-enter', '-webkit-transition:1s linear all;' +
-                                      'transition:1s linear all;');
+    inject(function($animate, $rootScope, $$body) {
+      $animate.enabled(true);
 
-      var element = html($compile('<div>...</div>')($rootScope));
-      var child = $compile('<div>...</div>')($rootScope);
+      element = jqLite('<div></div>');
 
-      $animate.enter(child, element);
+      $animate.enter(element, $$body);
       $rootScope.$digest();
 
-      if ($sniffer.transitions) {
-        $animate.triggerReflow();
-        expect(child.hasClass('ng-enter')).toBe(true);
-        expect(child.hasClass('ng-enter-active')).toBe(true);
-        browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-      }
-
-      expect(child.hasClass('ng-enter')).toBe(false);
-      expect(child.hasClass('ng-enter-active')).toBe(false);
-    }));
-
-
-    it("should properly animate and parse CSS3 animations",
-      inject(function($compile, $rootScope, $animate, $sniffer) {
+      expect(capturedAnimation).toBeTruthy();
+    });
+  });
 
-      ss.addRule('.ng-enter', '-webkit-animation: some_animation 4s linear 1s 2 alternate;' +
-                                      'animation: some_animation 4s linear 1s 2 alternate;');
+  describe('during bootstrap', function() {
+    it('should be enabled only after the first digest is fired and the postDigest queue is empty',
+      inject(function($animate, $rootScope) {
 
-      var element = html($compile('<div>...</div>')($rootScope));
-      var child = $compile('<div>...</div>')($rootScope);
+      var capturedEnabledState;
+      $rootScope.$$postDigest(function() {
+        capturedEnabledState = $animate.enabled();
+      });
 
-      $animate.enter(child, element);
+      expect($animate.enabled()).toBe(false);
       $rootScope.$digest();
 
-      if ($sniffer.transitions) {
-        $animate.triggerReflow();
-        expect(child.hasClass('ng-enter')).toBe(true);
-        expect(child.hasClass('ng-enter-active')).toBe(true);
-        browserTrigger(child,'transitionend', { timeStamp: Date.now() + 9000, elapsedTime: 9 });
-      }
-      expect(child.hasClass('ng-enter')).toBe(false);
-      expect(child.hasClass('ng-enter-active')).toBe(false);
-    }));
-
-
-    it("should skip animations if the browser does not support CSS3 transitions and CSS3 animations",
-      inject(function($compile, $rootScope, $animate, $sniffer) {
-
-      $sniffer.animations = false;
-      $sniffer.transitions = false;
-
-      ss.addRule('.ng-enter', '-webkit-animation: some_animation 4s linear 1s 2 alternate;' +
-                                      'animation: some_animation 4s linear 1s 2 alternate;');
-
-      var element = html($compile('<div>...</div>')($rootScope));
-      var child = $compile('<div>...</div>')($rootScope);
-
-      expect(child.hasClass('ng-enter')).toBe(false);
-      $animate.enter(child, element);
-      $rootScope.$digest();
-      expect(child.hasClass('ng-enter')).toBe(false);
+      expect(capturedEnabledState).toBe(false);
+      expect($animate.enabled()).toBe(true);
     }));
 
+    it('should be disabled until all pending template requests have been downloaded', function() {
+      var mockTemplateRequest = {
+        totalPendingRequests: 2
+      };
 
-    it("should run other defined animations inline with CSS3 animations", function() {
-      module(function($animateProvider) {
-        $animateProvider.register('.custom', function($timeout) {
-          return {
-            enter: function(element, done) {
-              element.addClass('i-was-animated');
-              $timeout(done, 10, false);
-            }
-          };
-        });
+      module(function($provide) {
+        $provide.value('$templateRequest', mockTemplateRequest);
       });
-      inject(function($compile, $rootScope, $animate, $sniffer) {
-
-        ss.addRule('.ng-enter', '-webkit-transition: 1s linear all;' +
-                                        'transition: 1s linear all;');
+      inject(function($animate, $rootScope) {
+        expect($animate.enabled()).toBe(false);
 
-        var element = html($compile('<div>...</div>')($rootScope));
-        var child = $compile('<div>...</div>')($rootScope);
-
-        expect(child.hasClass('i-was-animated')).toBe(false);
-
-        child.addClass('custom');
-        $animate.enter(child, element);
         $rootScope.$digest();
+        expect($animate.enabled()).toBe(false);
 
-        if ($sniffer.transitions) {
-          $animate.triggerReflow();
-          browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-        }
-
-        expect(child.hasClass('i-was-animated')).toBe(true);
+        mockTemplateRequest.totalPendingRequests = 0;
+        $rootScope.$digest();
+        expect($animate.enabled()).toBe(true);
       });
     });
 
+    it('should stay disabled if set to be disabled even after all templates have been fully downloaded', function() {
+      var mockTemplateRequest = {
+        totalPendingRequests: 2
+      };
 
-    it("should properly cancel CSS transitions or animations if another animation is fired", function() {
-      module(function($animateProvider) {
-        $animateProvider.register('.usurper', function($timeout) {
-          return {
-            leave: function(element, done) {
-              element.addClass('this-is-mine-now');
-              $timeout(done, 55, false);
-            }
-          };
-        });
+      module(function($provide) {
+        $provide.value('$templateRequest', mockTemplateRequest);
       });
-      inject(function($compile, $rootScope, $animate, $sniffer, $timeout) {
-        ss.addRule('.ng-enter', '-webkit-transition: 2s linear all;' +
-                                        'transition: 2s linear all;');
-        ss.addRule('.ng-leave', '-webkit-transition: 2s linear all;' +
-                                        'transition: 2s linear all;');
-
-        var element = html($compile('<div>...</div>')($rootScope));
-        var child = $compile('<div>...</div>')($rootScope);
+      inject(function($animate, $rootScope) {
+        $animate.enabled(false);
+        expect($animate.enabled()).toBe(false);
 
-        $animate.enter(child, element);
         $rootScope.$digest();
+        expect($animate.enabled()).toBe(false);
 
-        //this is added/removed right away otherwise
-        if ($sniffer.transitions) {
-          $animate.triggerReflow();
-          expect(child.hasClass('ng-enter')).toBe(true);
-          expect(child.hasClass('ng-enter-active')).toBe(true);
-        }
-
-        expect(child.hasClass('this-is-mine-now')).toBe(false);
-        child.addClass('usurper');
-        $animate.leave(child);
+        mockTemplateRequest.totalPendingRequests = 0;
         $rootScope.$digest();
-        $animate.triggerCallbackPromise();
-
-        expect(child.hasClass('ng-enter')).toBe(false);
-        expect(child.hasClass('ng-enter-active')).toBe(false);
-
-        expect(child.hasClass('usurper')).toBe(true);
-        expect(child.hasClass('this-is-mine-now')).toBe(true);
-
-        $timeout.flush(55);
+        expect($animate.enabled()).toBe(false);
       });
     });
+  });
 
+  describe('$animate', function() {
+    var parent;
+    var parent2;
+    var options;
+    var capturedAnimation;
+    var capturedAnimationHistory;
+    var overriddenAnimationRunner;
+    var defaultFakeAnimationRunner;
 
-    it("should not perform the active class animation if the animation has been cancelled before the reflow occurs", function() {
-      inject(function($compile, $rootScope, $animate, $sniffer) {
-        if (!$sniffer.transitions) return;
-
-        ss.addRule('.animated.ng-enter', '-webkit-transition: 2s linear all;' +
-                                                 'transition: 2s linear all;');
-
-        var element = html($compile('<div>...</div>')($rootScope));
-        var child = $compile('<div class="animated">...</div>')($rootScope);
-
-        $animate.enter(child, element);
-        $rootScope.$digest();
-
-        expect(child.hasClass('ng-enter')).toBe(true);
-
-        $animate.leave(child);
-        $rootScope.$digest();
-
-        $animate.triggerReflow();
-        expect(child.hasClass('ng-enter-active')).toBe(false);
-      });
-    });
+    beforeEach(module(function($provide) {
+      overriddenAnimationRunner = null;
+      capturedAnimation = null;
+      capturedAnimationHistory = [];
 
-    //
-  //  it("should add and remove CSS classes and perform CSS animations during the process",
-  //    inject(function($compile, $rootScope, $animate, $sniffer, $timeout) {
-  //
-  //    ss.addRule('.on-add', '-webkit-transition: 10s linear all; ' +
-  //                                  'transition: 10s linear all;');
-  //    ss.addRule('.on-remove', '-webkit-transition: 10s linear all; ' +
-  //                                     'transition: 10s linear all;');
-  //
-  //    var element = html($compile('<div></div>')($rootScope));
-  //
-  //    expect(element.hasClass('on')).toBe(false);
-  //
-  //    $animate.addClass(element, 'on');
-  //
-  //    if($sniffer.transitions) {
-  //      expect(element.hasClass('on')).toBe(false);
-  //      expect(element.hasClass('on-add')).toBe(true);
-  //      $animate.triggerCallbackPromise();
-  //    }
-  //
-  //    $animate.triggerCallbackPromise();
-  //
-  //    expect(element.hasClass('on')).toBe(true);
-  //    expect(element.hasClass('on-add')).toBe(false);
-  //    expect(element.hasClass('on-add-active')).toBe(false);
-  //
-  //    $animate.removeClass(element, 'on');
-  //    if($sniffer.transitions) {
-  //      expect(element.hasClass('on')).toBe(true);
-  //      expect(element.hasClass('on-remove')).toBe(true);
-  //      $timeout.flush(10000);
-  //    }
-  //
-  //    $animate.triggerCallbackPromise();
-  //    expect(element.hasClass('on')).toBe(false);
-  //    expect(element.hasClass('on-remove')).toBe(false);
-  //    expect(element.hasClass('on-remove-active')).toBe(false);
-  //  }));
-  //
-  //
-  //  it("should show and hide elements with CSS & JS animations being performed in the process", function() {
-  //    module(function($animateProvider) {
-  //      $animateProvider.register('.displayer', function($timeout) {
-  //        return {
-  //          removeClass : function(element, className, done) {
-  //            element.removeClass('hiding');
-  //            element.addClass('showing');
-  //            $timeout(done, 25, false);
-  //          },
-  //          addClass : function(element, className, done) {
-  //            element.removeClass('showing');
-  //            element.addClass('hiding');
-  //            $timeout(done, 555, false);
-  //          }
-  //        }
-  //      });
-  //    })
-  //    inject(function($compile, $rootScope, $animate, $sniffer, $timeout) {
-  //
-  //      ss.addRule('.ng-hide-add', '-webkit-transition: 5s linear all;' +
-  //                                         'transition: 5s linear all;');
-  //      ss.addRule('.ng-hide-remove', '-webkit-transition: 5s linear all;' +
-  //                                            'transition: 5s linear all;');
-  //
-  //      var element = html($compile('<div></div>')($rootScope));
-  //
-  //      element.addClass('displayer');
-  //
-  //      expect(element).toBeShown();
-  //      expect(element.hasClass('showing')).toBe(false);
-  //      expect(element.hasClass('hiding')).toBe(false);
-  //
-  //      $animate.addClass(element, 'ng-hide');
-  //
-  //      if($sniffer.transitions) {
-  //        expect(element).toBeShown(); //still showing
-  //        $animate.triggerCallbackPromise();
-  //        expect(element).toBeShown();
-  //        $timeout.flush(5555);
-  //      }
-  //      $animate.triggerCallbackPromise();
-  //      expect(element).toBeHidden();
-  //
-  //      expect(element.hasClass('showing')).toBe(false);
-  //      expect(element.hasClass('hiding')).toBe(true);
-  //      $animate.removeClass(element, 'ng-hide');
-  //
-  //      if($sniffer.transitions) {
-  //        expect(element).toBeHidden();
-  //        $animate.triggerCallbackPromise();
-  //        expect(element).toBeHidden();
-  //        $timeout.flush(5580);
-  //      }
-  //      $animate.triggerCallbackPromise();
-  //      expect(element).toBeShown();
-  //
-  //      expect(element.hasClass('showing')).toBe(true);
-  //      expect(element.hasClass('hiding')).toBe(false);
-  //    });
-  //  });
-
-
-    it("should remove all the previous classes when the next animation is applied before a reflow", function() {
-      var fn, interceptedClass;
-      module(function($animateProvider) {
-        $animateProvider.register('.three', function() {
-          return {
-            move: function(element, done) {
-              fn = function() {
-                done();
-              };
-              return function() {
-                interceptedClass = element.attr('class');
-              };
-            }
-          };
-        });
+      options = {};
+      $provide.value('$$animation', function() {
+        capturedAnimationHistory.push(capturedAnimation = arguments);
+        return overriddenAnimationRunner || defaultFakeAnimationRunner;
       });
-      inject(function($compile, $rootScope, $animate) {
-        var parent = html($compile('<div class="parent"></div>')($rootScope));
-        var one = $compile('<div class="one"></div>')($rootScope);
-        var two = $compile('<div class="two"></div>')($rootScope);
-        var three = $compile('<div class="three klass"></div>')($rootScope);
 
-        parent.append(one);
-        parent.append(two);
-        parent.append(three);
-
-        $animate.move(three, null, two);
-        $rootScope.$digest();
-
-        $animate.move(three, null, one);
-        $rootScope.$digest();
+      return function($rootElement, $q, $animate, $$AnimateRunner, $$body) {
+        defaultFakeAnimationRunner = new $$AnimateRunner();
+        $animate.enabled(true);
 
-        //this means that the former animation was cleaned up before the new one starts
-        expect(interceptedClass.indexOf('ng-animate') >= 0).toBe(false);
-      });
-    });
+        element = jqLite('<div class="element">element</div>');
+        parent = jqLite('<div class="parent1">parent</div>');
+        parent2 = jqLite('<div class="parent2">parent</div>');
 
+        $rootElement.append(parent);
+        $rootElement.append(parent2);
+        $$body.append($rootElement);
+      };
+    }));
 
-    it("should provide the correct CSS class to the addClass and removeClass callbacks within a JS animation", function() {
+    it('should animate only the specified CSS className matched within $animateProvider.classNameFilter', function() {
       module(function($animateProvider) {
-        $animateProvider.register('.classify', function() {
-          return {
-            removeClass: function(element, className, done) {
-              element.data('classify','remove-' + className);
-              done();
-            },
-            addClass: function(element, className, done) {
-              element.data('classify','add-' + className);
-              done();
-            }
-          };
-        });
+        $animateProvider.classNameFilter(/only-allow-this-animation/);
       });
-      inject(function($compile, $rootScope, $animate) {
-        var element = html($compile('<div class="classify"></div>')($rootScope));
+      inject(function($animate, $rootScope) {
+        expect(element).not.toHaveClass('only-allow-this-animation');
 
-        $animate.addClass(element, 'super');
+        $animate.enter(element, parent);
         $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(element.data('classify')).toBe('add-super');
+        expect(capturedAnimation).toBeFalsy();
 
-        $animate.removeClass(element, 'super');
-        $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(element.data('classify')).toBe('remove-super');
+        element.addClass('only-allow-this-animation');
 
-        $animate.addClass(element, 'superguy');
+        $animate.leave(element, parent);
         $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(element.data('classify')).toBe('add-superguy');
+        expect(capturedAnimation).toBeTruthy();
       });
     });
 
+    they('should nullify both options.$prop when passed into an animation if it is not a string or an array', ['addClass', 'removeClass'], function(prop) {
+      inject(function($animate, $rootScope) {
+        var options1 = {};
+        options1[prop] = function() {};
+        $animate.enter(element, parent, null, options1);
 
-    it("should not skip ngAnimate animations when any pre-existing CSS transitions are present on the element", function() {
-      inject(function($compile, $rootScope, $animate, $timeout, $sniffer) {
-        if (!$sniffer.transitions) return;
-
-        var element = html($compile('<div class="animated parent"></div>')($rootScope));
-        var child   = html($compile('<div class="animated child"></div>')($rootScope));
+        expect(options1[prop]).toBeFalsy();
+        $rootScope.$digest();
 
-        ss.addRule('.animated',  '-webkit-transition:1s linear all;' +
-                                         'transition:1s linear all;');
-        ss.addRule('.super-add', '-webkit-transition:2s linear all;' +
-                                         'transition:2s linear all;');
+        var options2 = {};
+        options2[prop] = true;
+        $animate.leave(element, options2);
 
-        $rootElement.append(element);
-        jqLite(document.body).append($rootElement);
+        expect(options2[prop]).toBeFalsy();
+        $rootScope.$digest();
 
-        $animate.addClass(element, 'super');
+        capturedAnimation = null;
 
-        var empty = true;
-        try {
-          $animate.triggerReflow();
-          empty = false;
+        var options3 = {};
+        if (prop === 'removeClass') {
+          element.addClass('fatias');
         }
-        catch (e) {}
 
-        expect(empty).toBe(false);
+        options3[prop] = ['fatias'];
+        $animate.enter(element, parent, null, options3);
+        expect(options3[prop]).toBe('fatias');
       });
     });
 
-
-    it("should wait until both the duration and delay are complete to close off the animation",
-      inject(function($compile, $rootScope, $animate, $timeout, $sniffer) {
-
-      if (!$sniffer.transitions) return;
-
-      var element = html($compile('<div class="animated parent"></div>')($rootScope));
-      var child   = html($compile('<div class="animated child"></div>')($rootScope));
-
-      ss.addRule('.animated.ng-enter',  '-webkit-transition: width 1s, background 1s 1s;' +
-                                                'transition: width 1s, background 1s 1s;');
-
-      $rootElement.append(element);
-      jqLite(document.body).append($rootElement);
-
-      $animate.enter(child, element);
-      $rootScope.$digest();
-      $animate.triggerReflow();
-
-      expect(child.hasClass('ng-enter')).toBe(true);
-      expect(child.hasClass('ng-enter-active')).toBe(true);
-
-      browserTrigger(child, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 0 });
-
-      expect(child.hasClass('ng-enter')).toBe(true);
-      expect(child.hasClass('ng-enter-active')).toBe(true);
-
-      browserTrigger(child, 'transitionend', { timeStamp: Date.now() + 2000, elapsedTime: 2 });
-
-      expect(child.hasClass('ng-enter')).toBe(false);
-      expect(child.hasClass('ng-enter-active')).toBe(false);
-
-      expect(element.contents().length).toBe(1);
-    }));
-
-
-    it("should cancel all child animations when a leave or move animation is triggered on a parent element", function() {
-
-      var step, animationState;
+    it('should throw a minErr if a regex value is used which partially contains or fully matches the `ng-animate` CSS class', function() {
       module(function($animateProvider) {
-        $animateProvider.register('.animan', function() {
-          return {
-            enter: function(element, done) {
-              animationState = 'enter';
-              step = done;
-              return function(cancelled) {
-                animationState = cancelled ? 'enter-cancel' : animationState;
-              };
-            },
-            addClass: function(element, className, done) {
-              animationState = 'addClass';
-              step = done;
-              return function(cancelled) {
-                animationState = cancelled ? 'addClass-cancel' : animationState;
-              };
-            }
-          };
-        });
-      });
-
-      inject(function($animate, $compile, $rootScope, $timeout, $sniffer) {
-        var element = html($compile('<div class="parent"></div>')($rootScope));
-        var container = html($compile('<div class="container"></div>')($rootScope));
-        var child   = html($compile('<div class="animan child"></div>')($rootScope));
-
-        ss.addRule('.animan.ng-enter, .animan.something-add',  '-webkit-transition: width 1s, background 1s 1s;' +
-                                                               'transition: width 1s, background 1s 1s;');
-
-        $rootElement.append(element);
-        jqLite(document.body).append($rootElement);
-
-        $animate.enter(child, element);
-        $rootScope.$digest();
-
-        expect(animationState).toBe('enter');
-        if ($sniffer.transitions) {
-          expect(child.hasClass('ng-enter')).toBe(true);
-          $animate.triggerReflow();
-          expect(child.hasClass('ng-enter-active')).toBe(true);
-        }
-
-        $animate.move(element, container);
-        if ($sniffer.transitions) {
-          expect(child.hasClass('ng-enter')).toBe(false);
-          expect(child.hasClass('ng-enter-active')).toBe(false);
-        }
-
-        expect(animationState).toBe('enter-cancel');
-
-        $rootScope.$digest();
-        $animate.triggerCallbacks();
+        assertError(/ng-animate/, true);
+        assertError(/first ng-animate last/, true);
+        assertError(/ng-animate-special/, false);
+        assertError(/first ng-animate-special last/, false);
+        assertError(/first ng-animate ng-animate-special last/, true);
+
+        function assertError(regex, bool) {
+          var expectation = expect(function() {
+            $animateProvider.classNameFilter(regex);
+          });
 
-        $animate.addClass(child, 'something');
-        $rootScope.$digest();
-        if ($sniffer.transitions) {
-          $animate.triggerReflow();
-        }
-        expect(animationState).toBe('addClass');
-        if ($sniffer.transitions) {
-          expect(child.hasClass('something-add')).toBe(true);
-          expect(child.hasClass('something-add-active')).toBe(true);
-        }
+          var message = '$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "ng-animate" CSS class.';
 
-        $animate.leave(container);
-        expect(animationState).toBe('addClass-cancel');
-        if ($sniffer.transitions) {
-          expect(child.hasClass('something-add')).toBe(false);
-          expect(child.hasClass('something-add-active')).toBe(false);
+          bool ? expectation.toThrowMinErr('$animate', 'nongcls', message)
+               : expectation.not.toThrowMinErr('$animate', 'nongcls', message);
         }
       });
-
     });
 
-    it('should coalesce all class-based animation calls together into a single animation', function() {
-      var log = [];
-      var track = function(name) {
-        return function() {
-          log.push({ name: name, className: arguments[1] });
-        };
-      };
+    it('should complete the leave DOM operation in case the classNameFilter fails', function() {
       module(function($animateProvider) {
-        $animateProvider.register('.animate', function() {
-          return {
-            addClass: track('addClass'),
-            removeClass: track('removeClass')
-          };
-        });
+        $animateProvider.classNameFilter(/memorable-animation/);
       });
-      inject(function($rootScope, $animate, $compile, $rootElement, $document) {
-        $animate.enabled(true);
-
-        var element = $compile('<div class="animate three"></div>')($rootScope);
-        $rootElement.append(element);
-        angular.element($document[0].body).append($rootElement);
-
-        $animate.addClass(element, 'one');
-        $animate.addClass(element, 'two');
-        $animate.removeClass(element, 'three');
-        $animate.removeClass(element, 'four');
-        $animate.setClass(element, 'four five', 'two');
+      inject(function($animate, $rootScope) {
+        expect(element).not.toHaveClass('memorable-animation');
 
+        parent.append(element);
+        $animate.leave(element);
         $rootScope.$digest();
-        $animate.triggerReflow();
 
-        expect(log.length).toBe(2);
-        expect(log[0]).toEqual({ name: 'addClass', className: 'one four five' });
-        expect(log[1]).toEqual({ name: 'removeClass', className: 'three' });
+        expect(capturedAnimation).toBeFalsy();
+        expect(element[0].parentNode).toBeFalsy();
       });
     });
 
-    it('should intelligently cancel out redundant class-based animations', function() {
-      var log = [];
-      var track = function(name) {
-        return function() {
-          log.push({ name: name, className: arguments[1] });
-        };
-      };
-      module(function($animateProvider) {
-        $animateProvider.register('.animate', function() {
-          return {
-            addClass: track('addClass'),
-            removeClass: track('removeClass')
-          };
-        });
-      });
-      inject(function($rootScope, $animate, $compile, $rootElement, $document) {
-        $animate.enabled(true);
-
-        var element = $compile('<div class="animate three four"></div>')($rootScope);
-        $rootElement.append(element);
-        angular.element($document[0].body).append($rootElement);
-
-        $animate.removeClass(element, 'one');
-        $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(log.length).toBe(0);
-        $animate.triggerCallbacks();
-
-        $animate.addClass(element, 'two');
-        $animate.addClass(element, 'two');
-        $animate.removeClass(element, 'two');
-        $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(log.length).toBe(0);
-        $animate.triggerCallbacks();
+    describe('enabled()', function() {
+      it("should work for all animations", inject(function($animate) {
 
-        $animate.removeClass(element, 'three');
-        $animate.addClass(element, 'three');
-        $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(log.length).toBe(0);
-        $animate.triggerCallbacks();
+        expect($animate.enabled()).toBe(true);
 
-        $animate.removeClass(element, 'four');
-        $animate.addClass(element, 'four');
-        $animate.removeClass(element, 'four');
-        $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(log.length).toBe(1);
-        $animate.triggerCallbacks();
-        expect(log[0]).toEqual({ name: 'removeClass', className: 'four' });
-
-        $animate.addClass(element, 'five');
-        $animate.addClass(element, 'five');
-        $animate.addClass(element, 'five');
-        $animate.removeClass(element, 'five');
-        $animate.addClass(element, 'five');
-        $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(log.length).toBe(2);
-        $animate.triggerCallbacks();
-        expect(log[1]).toEqual({ name: 'addClass', className: 'five' });
-      });
-    });
+        expect($animate.enabled(0)).toBe(false);
+        expect($animate.enabled()).toBe(false);
 
-    it('should skip class-based animations if the element is removed before the digest occurs', function() {
-      var spy = jasmine.createSpy();
-      module(function($animateProvider) {
-        $animateProvider.register('.animated', function() {
-          return {
-            beforeAddClass: spy,
-            beforeRemoveClass: spy,
-            beforeSetClass: spy
-          };
-        });
-      });
-      inject(function($rootScope, $animate, $compile, $rootElement, $document) {
-        $animate.enabled(true);
+        expect($animate.enabled(1)).toBe(true);
+        expect($animate.enabled()).toBe(true);
+      }));
 
-        var one = $compile('<div class="animated"></div>')($rootScope);
-        var two = $compile('<div class="animated"></div>')($rootScope);
-        var three = $compile('<div class="animated three"></div>')($rootScope);
+      it('should fully disable all animations in the application if false',
+        inject(function($animate, $rootScope) {
 
-        $rootElement.append(one);
-        $rootElement.append(two);
-        angular.element($document[0].body).append($rootElement);
+        $animate.enabled(false);
 
-        $animate.addClass(one, 'active-class');
-        one.remove();
+        $animate.enter(element, parent);
 
+        expect(capturedAnimation).toBeFalsy();
         $rootScope.$digest();
-        expect(spy).not.toHaveBeenCalled();
+        expect(capturedAnimation).toBeFalsy();
+      }));
 
-        $animate.addClass(two, 'active-class');
+      it('should disable all animations on the given element',
+        inject(function($animate, $rootScope) {
 
-        $rootScope.$digest();
-        expect(spy).toHaveBeenCalled();
+        parent.append(element);
 
-        spy.reset();
-        $animate.removeClass(two, 'active-class');
-        two.remove();
+        $animate.enabled(element, false);
+        expect($animate.enabled(element)).toBeFalsy();
 
+        $animate.addClass(element, 'red');
+        expect(capturedAnimation).toBeFalsy();
         $rootScope.$digest();
-        expect(spy).not.toHaveBeenCalled();
+        expect(capturedAnimation).toBeFalsy();
 
-        $animate.setClass(three, 'active-class', 'three');
-        three.remove();
+        $animate.enabled(element, true);
+        expect($animate.enabled(element)).toBeTruthy();
 
+        $animate.addClass(element, 'blue');
+        expect(capturedAnimation).toBeFalsy();
         $rootScope.$digest();
-        expect(spy).not.toHaveBeenCalled();
-      });
-    });
-
-    it('should skip class-based animations if ngRepeat has marked the element or its parent for removal', function() {
-      var spy = jasmine.createSpy();
-      module(function($animateProvider) {
-        $animateProvider.register('.animated', function() {
-          return {
-            beforeAddClass: spy,
-            beforeRemoveClass: spy,
-            beforeSetClass: spy
-          };
-        });
-      });
-      inject(function($rootScope, $animate, $compile, $rootElement, $document) {
-        $animate.enabled(true);
+        expect(capturedAnimation).toBeTruthy();
+      }));
 
-        var element = $compile(
-          '<div>' +
-          '  <div ng-repeat="item in items" class="animated">' +
-          '    <span>{{ $index }}</span>' +
-          '  </div>' +
-          '</div>'
-        )($rootScope);
+      it('should disable all animations for a given element\'s children',
+        inject(function($animate, $rootScope) {
 
-        $rootElement.append(element);
-        angular.element($document[0].body).append($rootElement);
+        $animate.enabled(parent, false);
 
-        $rootScope.items = [1,2,3];
+        $animate.enter(element, parent);
+        expect(capturedAnimation).toBeFalsy();
         $rootScope.$digest();
+        expect(capturedAnimation).toBeFalsy();
 
-        var child = element.find('div');
+        $animate.enabled(parent, true);
 
-        $animate.addClass(child, 'start-animation');
-        $rootScope.items = [2,3];
+        $animate.enter(element, parent);
+        expect(capturedAnimation).toBeFalsy();
         $rootScope.$digest();
+        expect(capturedAnimation).toBeTruthy();
+      }));
+    });
 
-        expect(spy).not.toHaveBeenCalled();
-
-        var innerChild = element.find('span');
+    it('should strip all comment nodes from the animation and not issue an animation if not real elements are found',
+      inject(function($rootScope, $compile) {
 
-        $animate.addClass(innerChild, 'start-animation');
-        $rootScope.items = [3];
-        $rootScope.$digest();
+      // since the ng-if results to false then only comments will be fed into the animation
+      element = $compile(
+        '<div><div class="animated" ng-if="false" ng-repeat="item in items"></div></div>'
+      )($rootScope);
 
-        expect(spy).not.toHaveBeenCalled();
-        dealoc(element);
-      });
-    });
+      parent.append(element);
 
-    it('should call class-based animation callbacks in the correct order when animations are skipped', function() {
-      var continueAnimation;
-      module(function($animateProvider) {
-        $animateProvider.register('.animate', function() {
-          return {
-            addClass: function(element, className, done) {
-              continueAnimation = done;
-            }
-          };
-        });
-      });
-      inject(function($rootScope, $animate, $compile, $rootElement, $document) {
-        $animate.enabled(true);
+      $rootScope.items = [1,2,3,4,5];
+      $rootScope.$digest();
 
-        var element = $compile('<div class="animate"></div>')($rootScope);
-        $rootElement.append(element);
-        angular.element($document[0].body).append($rootElement);
+      expect(capturedAnimation).toBeFalsy();
+    }));
 
-        var log = '';
-        $animate.addClass(element, 'one').then(function() {
-          log += 'A';
-        });
-        $rootScope.$digest();
+    it('should not attempt to perform an animation on a text node element',
+      inject(function($rootScope, $animate) {
 
-        $animate.addClass(element, 'one').then(function() {
-          log += 'B';
-        });
-        $rootScope.$digest();
-        $animate.triggerCallbackPromise();
+      element.html('hello there');
+      var textNode = jqLite(element[0].firstChild);
 
-        $animate.triggerReflow();
-        continueAnimation();
-        $animate.triggerCallbackPromise();
-        expect(log).toBe('BA');
-      });
-    });
+      $animate.addClass(textNode, 'some-class');
+      $rootScope.$digest();
 
-    it('should skip class-based animations when add class and remove class cancel each other out', function() {
-      var spy = jasmine.createSpy();
-      module(function($animateProvider) {
-        $animateProvider.register('.animate', function() {
-          return {
-            addClass: spy,
-            removeClass: spy
-          };
-        });
-      });
-      inject(function($rootScope, $animate, $compile) {
-        $animate.enabled(true);
+      expect(capturedAnimation).toBeFalsy();
+    }));
 
-        var element = $compile('<div class="animate"></div>')($rootScope);
+    it('should perform the leave domOperation if a text node is used',
+      inject(function($rootScope, $animate) {
 
-        var count = 0;
-        var callback = function() {
-          count++;
-        };
+      element.html('hello there');
+      var textNode = jqLite(element[0].firstChild);
+      var parentNode = textNode[0].parentNode;
+
+      $animate.leave(textNode);
+      $rootScope.$digest();
+      expect(capturedAnimation).toBeFalsy();
+      expect(textNode[0].parentNode).not.toBe(parentNode);
+    }));
 
-        $animate.addClass(element, 'on').then(callback);
-        $animate.addClass(element, 'on').then(callback);
-        $animate.removeClass(element, 'on').then(callback);
-        $animate.removeClass(element, 'on').then(callback);
+    it('should perform the leave domOperation if a comment node is used',
+      inject(function($rootScope, $animate, $document) {
 
-        $rootScope.$digest();
-        $animate.triggerCallbackPromise();
+      var doc = $document[0];
 
-        expect(spy).not.toHaveBeenCalled();
-        expect(count).toBe(4);
-      });
-    });
+      element.html('hello there');
+      var commentNode = jqLite(doc.createComment('test comment'));
+      var parentNode = element[0];
+      parentNode.appendChild(commentNode[0]);
 
-    it("should wait until a queue of animations are complete before performing a reflow",
-      inject(function($rootScope, $compile, $timeout, $sniffer, $animate) {
+      $animate.leave(commentNode);
+      $rootScope.$digest();
+      expect(capturedAnimation).toBeFalsy();
+      expect(commentNode[0].parentNode).not.toBe(parentNode);
+    }));
 
-      if (!$sniffer.transitions) return;
+    it('enter() should issue an enter animation and fire the DOM operation right away before the animation kicks off', inject(function($animate, $rootScope) {
+      expect(parent.children().length).toBe(0);
 
-      $rootScope.items = [1,2,3,4,5];
-      var element = html($compile('<div><div class="animated" ng-repeat="item in items"></div></div>')($rootScope));
+      options.foo = 'bar';
+      $animate.enter(element, parent, null, options);
 
-      ss.addRule('.animated.ng-enter',  '-webkit-transition: width 1s, background 1s 1s;' +
-                                                'transition: width 1s, background 1s 1s;');
+      expect(parent.children().length).toBe(1);
 
       $rootScope.$digest();
-      expect(element[0].querySelectorAll('.ng-enter-active').length).toBe(0);
-      $animate.triggerReflow();
-      expect(element[0].querySelectorAll('.ng-enter-active').length).toBe(5);
-
-      forEach(element.children(), function(kid) {
-        browserTrigger(kid, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-      });
 
-      expect(element[0].querySelectorAll('.ng-enter-active').length).toBe(0);
+      expect(capturedAnimation[0]).toBe(element);
+      expect(capturedAnimation[1]).toBe('enter');
+      expect(capturedAnimation[2].foo).toEqual(options.foo);
     }));
 
+    it('move() should issue an enter animation and fire the DOM operation right away before the animation kicks off', inject(function($animate, $rootScope) {
+      parent.append(element);
 
-    it("should work to disable all child animations for an element", function() {
-      var childAnimated = false,
-          containerAnimated = false;
-      module(function($animateProvider) {
-        $animateProvider.register('.child', function() {
-          return {
-            addClass: function(element, className, done) {
-              childAnimated = true;
-              done();
-            }
-          };
-        });
-        $animateProvider.register('.container', function() {
-          return {
-            leave: function(element, done) {
-              containerAnimated = true;
-              done();
-            }
-          };
-        });
-      });
-
-      inject(function($compile, $rootScope, $animate, $timeout, $rootElement) {
-        $animate.enabled(true);
+      expect(parent.children().length).toBe(1);
+      expect(parent2.children().length).toBe(0);
 
-        var element = $compile('<div class="container"></div>')($rootScope);
-        jqLite($document[0].body).append($rootElement);
-        $rootElement.append(element);
+      options.foo = 'bar';
+      $animate.move(element, parent2, null, options);
 
-        var child = $compile('<div class="child"></div>')($rootScope);
-        element.append(child);
+      expect(parent.children().length).toBe(0);
+      expect(parent2.children().length).toBe(1);
 
-        $animate.enabled(true, element);
+      $rootScope.$digest();
 
-        $animate.addClass(child, 'awesome');
-        $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(childAnimated).toBe(true);
+      expect(capturedAnimation[0]).toBe(element);
+      expect(capturedAnimation[1]).toBe('move');
+      expect(capturedAnimation[2].foo).toEqual(options.foo);
+    }));
 
-        childAnimated = false;
-        $animate.enabled(false, element);
+    they('$prop() should insert the element adjacent to the after element if provided',
+      ['enter', 'move'], function(event) {
 
-        $animate.addClass(child, 'super');
+      inject(function($animate, $rootScope) {
+        parent.append(element);
+        assertCompareNodes(parent2.next(), element, true);
+        $animate[event](element, null, parent2, options);
+        assertCompareNodes(parent2.next(), element);
         $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(childAnimated).toBe(false);
+        expect(capturedAnimation[1]).toBe(event);
+      });
+    });
 
-        $animate.leave(element);
+    they('$prop() should append to the parent incase the after element is destroyed before the DOM operation is issued',
+      ['enter', 'move'], function(event) {
+      inject(function($animate, $rootScope) {
+        parent2.remove();
+        $animate[event](element, parent, parent2, options);
+        expect(parent2.next()).not.toEqual(element);
         $rootScope.$digest();
-        expect(containerAnimated).toBe(true);
+        expect(capturedAnimation[1]).toBe(event);
       });
     });
 
+    it('leave() should issue a leave animation with the correct DOM operation', inject(function($animate, $rootScope) {
+      parent.append(element);
+      options.foo = 'bar';
+      $animate.leave(element, options);
+      $rootScope.$digest();
 
-    it("should disable all child animations on structural animations until the post animation " +
-       "timeout has passed as well as all structural animations", function() {
-      var intercepted, continueAnimation;
-      module(function($animateProvider) {
-        $animateProvider.register('.animated', function() {
-          return {
-            enter: ani('enter'),
-            leave: ani('leave'),
-            move: ani('move'),
-            addClass: ani('addClass'),
-            removeClass: ani('removeClass')
-          };
-
-          function ani(type) {
-            return function(element, className, done) {
-              intercepted = type;
-              continueAnimation = function() {
-                continueAnimation = angular.noop;
-                (done || className)();
-              };
-            };
-          }
-        });
-      });
+      expect(capturedAnimation[0]).toBe(element);
+      expect(capturedAnimation[1]).toBe('leave');
+      expect(capturedAnimation[2].foo).toEqual(options.foo);
 
-      inject(function($animate, $rootScope, $sniffer, $timeout, $compile, _$rootElement_) {
-        $rootElement = _$rootElement_;
+      expect(element.parent().length).toBe(1);
+      capturedAnimation[2].domOperation();
+      expect(element.parent().length).toBe(0);
+    }));
 
-        $animate.enabled(true);
-        $rootScope.$digest();
+    it('should remove all element and comment nodes during leave animation',
+      inject(function($compile, $rootScope, $$rAF, $$AnimateRunner) {
+
+      element = $compile(
+        '<div>' +
+        '  <div class="animated" ng-repeat-start="item in items">start</div>' +
+        '  <div ng-repeat-end>end</div>' +
+        '</div>'
+      )($rootScope);
 
-        var element = $compile('<div class="element animated">...</div>')($rootScope);
-        var child1 = $compile('<div class="child1 animated">...</div>')($rootScope);
-        var child2 = $compile('<div class="child2 animated">...</div>')($rootScope);
-        var container = $compile('<div class="container">...</div>')($rootScope);
+      parent.append(element);
 
-        var body = angular.element($document[0].body);
-        body.append($rootElement);
-        $rootElement.append(container);
-        element.append(child1);
-        element.append(child2);
+      $rootScope.items = [1,2,3,4,5];
+      $rootScope.$digest();
 
-        $animate.enter(element, container);
-        $rootScope.$digest();
+      // all the start/end repeat anchors + their adjacent comments
+      expect(element[0].childNodes.length).toBe(22);
 
-        expect(intercepted).toBe('enter');
-        continueAnimation();
+      var runner = new $$AnimateRunner();
+      overriddenAnimationRunner = runner;
 
-        $animate.addClass(child1, 'test');
-        $rootScope.$digest();
-        $animate.triggerReflow();
-        expect(child1.hasClass('test')).toBe(true);
+      $rootScope.items.length = 0;
+      $rootScope.$digest();
+      runner.end();
+      $$rAF.flush();
 
-        expect(element.children().length).toBe(2);
+      // we're left with a text node and a comment node
+      expect(element[0].childNodes.length).toBeLessThan(3);
+    }));
 
-        expect(intercepted).toBe('enter');
-        $animate.leave(child1);
-        $rootScope.$digest();
 
-        expect(element.children().length).toBe(1);
+    it('addClass() should issue an addClass animation with the correct DOM operation', inject(function($animate, $rootScope) {
+      parent.append(element);
+      options.foo = 'bar';
+      $animate.addClass(element, 'red', options);
+      $rootScope.$digest();
 
-        expect(intercepted).toBe('enter');
+      expect(capturedAnimation[0]).toBe(element);
+      expect(capturedAnimation[1]).toBe('addClass');
+      expect(capturedAnimation[2].foo).toEqual(options.foo);
 
-        $animate.move(element, null, container);
-        $rootScope.$digest();
+      expect(element).not.toHaveClass('red');
+      applyAnimationClasses(element, capturedAnimation[2]);
+      expect(element).toHaveClass('red');
+    }));
 
-        expect(intercepted).toBe('move');
+    it('removeClass() should issue a removeClass animation with the correct DOM operation', inject(function($animate, $rootScope) {
+      parent.append(element);
+      element.addClass('blue');
 
-        //flush the POST enter callback
-        $animate.triggerCallbacks();
+      options.foo = 'bar';
+      $animate.removeClass(element, 'blue', options);
+      $rootScope.$digest();
 
-        $animate.addClass(child2, 'testing');
-        $rootScope.$digest();
-        expect(intercepted).toBe('move');
+      expect(capturedAnimation[0]).toBe(element);
+      expect(capturedAnimation[1]).toBe('removeClass');
+      expect(capturedAnimation[2].foo).toEqual(options.foo);
 
-        continueAnimation();
+      expect(element).toHaveClass('blue');
+      applyAnimationClasses(element, capturedAnimation[2]);
+      expect(element).not.toHaveClass('blue');
+    }));
 
-        //flush the POST move callback
-        $animate.triggerCallbacks();
+    it('setClass() should issue a setClass animation with the correct DOM operation', inject(function($animate, $rootScope) {
+      parent.append(element);
+      element.addClass('green');
 
-        $animate.leave(child2);
-        $rootScope.$digest();
-        expect(intercepted).toBe('leave');
-      });
-    });
+      options.foo = 'bar';
+      $animate.setClass(element, 'yellow', 'green', options);
+      $rootScope.$digest();
 
+      expect(capturedAnimation[0]).toBe(element);
+      expect(capturedAnimation[1]).toBe('setClass');
+      expect(capturedAnimation[2].foo).toEqual(options.foo);
 
-    it("should not disable any child animations when any parent class-based animations are run", function() {
-      var intercepted;
-      module(function($animateProvider) {
-        $animateProvider.register('.animated', function() {
-          return {
-            enter: function(element, done) {
-              intercepted = true;
-              done();
-            }
-          };
-        });
-      });
+      expect(element).not.toHaveClass('yellow');
+      expect(element).toHaveClass('green');
+      applyAnimationClasses(element, capturedAnimation[2]);
+      expect(element).toHaveClass('yellow');
+      expect(element).not.toHaveClass('green');
+    }));
 
-      inject(function($animate, $rootScope, $sniffer, $timeout, $compile, $document, $rootElement) {
+    they('should apply the $prop CSS class to the element before digest for the given event and remove when complete',
+      {'ng-enter': 'enter', 'ng-leave': 'leave', 'ng-move': 'move'}, function(event) {
+
+      inject(function($animate, $rootScope, $document, $rootElement) {
         $animate.enabled(true);
 
-        var element = $compile('<div ng-class="{klass:bool}"> <div ng-if="bool" class="animated">value</div></div>')($rootScope);
-        $rootElement.append(element);
+        var element = jqLite('<div></div>');
+        var parent = jqLite('<div></div>');
+
+        $rootElement.append(parent);
         jqLite($document[0].body).append($rootElement);
 
-        $rootScope.bool = true;
-        $rootScope.$digest();
+        var runner;
+        if (event === 'leave') {
+          parent.append(element);
+          runner = $animate[event](element);
+        } else {
+          runner = $animate[event](element, parent);
+        }
 
-        expect(intercepted).toBe(true);
-      });
-    });
+        var expectedClassName = 'ng-' + event;
 
+        expect(element).toHaveClass(expectedClassName);
 
-    it("should cache the response from getComputedStyle if each successive element has the same className value and parent until the first reflow hits", function() {
-      var count = 0;
-      module(function($provide) {
-        $provide.value('$window', {
-          document: jqLite(window.document),
-          getComputedStyle: function(element) {
-            count++;
-            return window.getComputedStyle(element);
-          }
-        });
+        $rootScope.$digest();
+        expect(element).toHaveClass(expectedClassName);
+
+        runner.end();
+        expect(element).not.toHaveClass(expectedClassName);
+
+        dealoc(parent);
       });
+    });
 
-      inject(function($animate, $rootScope, $compile, $rootElement, $timeout, $document, $sniffer) {
-        if (!$sniffer.transitions) return;
+    they('should add CSS classes with the $prop suffix when depending on the event and remove when complete',
+      {'-add': 'add', '-remove': 'remove'}, function(event) {
 
+      inject(function($animate, $rootScope, $document, $rootElement) {
         $animate.enabled(true);
 
-        var kid, element = $compile('<div></div>')($rootScope);
+        var element = jqLite('<div></div>');
+
         $rootElement.append(element);
         jqLite($document[0].body).append($rootElement);
 
-        for (var i = 0; i < 20; i++) {
-          kid = $compile('<div class="kid"></div>')($rootScope);
-          $animate.enter(kid, element);
+        var classes = 'one two';
+        var expectedClasses = ['one-',event,' ','two-', event].join('');
+
+        var runner;
+        if (event === 'add') {
+          runner = $animate.addClass(element, classes);
+        } else {
+          element.addClass(classes);
+          runner = $animate.removeClass(element, classes);
         }
+
+        expect(element).toHaveClass(expectedClasses);
+
         $rootScope.$digest();
+        expect(element).toHaveClass(expectedClasses);
 
-        //called three times since the classname is the same
-        expect(count).toBe(2);
+        runner.end();
+        expect(element).not.toHaveClass(expectedClasses);
 
         dealoc(element);
-        count = 0;
+      });
+    });
+
+    they('$prop() should operate using a native DOM element',
+      ['enter', 'move', 'leave', 'addClass', 'removeClass', 'setClass', 'animate'], function(event) {
 
-        for (i = 0; i < 20; i++) {
-          kid = $compile('<div class="kid c-' + i + '"></div>')($rootScope);
-          $animate.enter(kid, element);
+      inject(function($animate, $rootScope, $document) {
+        var element = $document[0].createElement('div');
+        element.setAttribute('id', 'crazy-man');
+        if (event !== 'enter' && event !== 'move') {
+          parent.append(element);
         }
 
-        $rootScope.$digest();
+        switch (event) {
+          case 'enter':
+          case 'move':
+            $animate[event](element, parent, parent2, options);
+            break;
+
+          case 'addClass':
+            $animate.addClass(element, 'klass', options);
+            break;
+
+          case 'removeClass':
+            element.className = 'klass';
+            $animate.removeClass(element, 'klass', options);
+            break;
+
+          case 'setClass':
+            element.className = 'two';
+            $animate.setClass(element, 'one', 'two', options);
+            break;
+
+          case 'leave':
+            $animate.leave(element, options);
+            break;
+
+          case 'animate':
+            var toStyles = { color: 'red' };
+            $animate.animate(element, {}, toStyles, 'klass', options);
+            break;
+        }
 
-        expect(count).toBe(20);
+        $rootScope.$digest();
+        expect(capturedAnimation[0].attr('id')).toEqual(element.getAttribute('id'));
       });
     });
 
-    it("should cache getComputedStyle with similar className values but with respect to the parent node",
-      inject(function($compile, $rootScope, $animate, $sniffer) {
+    describe('addClass / removeClass', function() {
+      it('should not perform an animation if there are no valid CSS classes to add',
+        inject(function($animate, $rootScope) {
 
-      if (!$sniffer.transitions) return;
+        parent.append(element);
 
-      $animate.enabled();
+        $animate.removeClass(element, 'something-to-remove');
+        $rootScope.$digest();
+        expect(capturedAnimation).toBeFalsy();
 
-      var html = '<div ng-class="{on:one}">first</div>' +
-                 '<div class="second">' +
-                 '  <div ng-class="{on:two}">second</div>' +
-                 '</div>';
+        element.addClass('something-to-add');
 
-      ss.addRule('.second .on', '-webkit-transition:1s linear all;' +
-                                        'transition:1s linear all;');
+        $animate.addClass(element, 'something-to-add');
+        $rootScope.$digest();
+        expect(capturedAnimation).toBeFalsy();
+      }));
+    });
 
-      var element = $compile(html)($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+    describe('animate()', function() {
+      they('should not perform an animation if $prop is provided as a `to` style',
+        { '{}': {},
+          'null': null,
+          'false': false,
+          '""': "",
+          '[]': [] }, function(toStyle) {
 
-      $rootScope.$apply(function() {
-        $rootScope.one = true;
-        $rootScope.two = true;
+        inject(function($animate, $rootScope) {
+          parent.append(element);
+          $animate.animate(element, null, toStyle);
+          $rootScope.$digest();
+          expect(capturedAnimation).toBeFalsy();
+        });
       });
 
-      $animate.triggerReflow();
-
-      var inner = jqLite(jqLite(element[1]).find('div'));
+      it('should not perform an animation if only from styles are provided',
+        inject(function($animate, $rootScope) {
 
-      expect(inner.hasClass('on-add')).toBe(true);
-      expect(inner.hasClass('on-add-active')).toBe(true);
-
-      browserTrigger(inner, 'animationend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
+        var fromStyle = { color: 'pink' };
+        parent.append(element);
+        $animate.animate(element, fromStyle);
+        $rootScope.$digest();
+        expect(capturedAnimation).toBeFalsy();
+      }));
 
-      expect(inner.hasClass('on-add')).toBe(false);
-      expect(inner.hasClass('on-add-active')).toBe(false);
-    }));
+      it('should perform an animation if only from styles are provided as well as any valid classes',
+        inject(function($animate, $rootScope) {
 
-    it("should reset the getComputedStyle lookup cache even when no animation is found",
-      inject(function($compile, $rootScope, $animate, $sniffer, $document) {
+        parent.append(element);
 
-      if (!$sniffer.transitions) return;
+        var fromStyle = { color: 'red' };
+        var options = { removeClass: 'goop' };
+        $animate.animate(element, fromStyle, null, null, options);
+        $rootScope.$digest();
+        expect(capturedAnimation).toBeFalsy();
 
-      $animate.enabled();
+        fromStyle = { color: 'blue' };
+        options = { addClass: 'goop' };
+        $animate.animate(element, fromStyle, null, null, options);
+        $rootScope.$digest();
+        expect(capturedAnimation).toBeTruthy();
+      }));
+    });
 
-      var html = '<div>' +
-                 '  <div class="toggle" ng-if="onOff">On or Off</div>' +
-                 '</div>';
+    describe('parent animations', function() {
+      they('should not cancel a pre-digest parent class-based animation if a child $prop animation is set to run',
+        ['structural', 'class-based'], function(animationType) {
 
-      ss.addRule('.activated .toggle', '-webkit-transition:1s linear all;' +
-                                               'transition:1s linear all;');
+        inject(function($rootScope, $animate, $$rAF) {
+          parent.append(element);
+          var child = jqLite('<div></div>');
 
-      var child, element = $compile(html)($rootScope);
+          if (animationType === 'structural') {
+            $animate.enter(child, element);
+          } else {
+            element.append(child);
+            $animate.addClass(child, 'test');
+          }
 
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+          $animate.addClass(parent, 'abc');
+          expect(capturedAnimationHistory.length).toBe(0);
+          $rootScope.$digest();
+          expect(capturedAnimationHistory.length).toBe(2);
+        });
+      });
 
-      $rootScope.onOff = true;
-      $rootScope.$digest();
+      they('should not cancel a post-digest parent class-based animation if a child $prop animation is set to run',
+        ['structural', 'class-based'], function(animationType) {
 
-      child = element.find('div');
-      expect(child).not.toHaveClass('ng-enter');
-      expect(child.parent()[0]).toEqual(element[0]);
-      $animate.triggerReflow();
+        inject(function($rootScope, $animate, $$rAF) {
+          parent.append(element);
+          var child = jqLite('<div></div>');
 
-      $rootScope.onOff = false;
-      $rootScope.$digest();
+          $animate.addClass(parent, 'abc');
+          $rootScope.$digest();
 
-      child = element.find('div');
-      expect(child.parent().length).toBe(0);
-      $animate.triggerReflow();
+          if (animationType === 'structural') {
+            $animate.enter(child, element);
+          } else {
+            element.append(child);
+            $animate.addClass(child, 'test');
+          }
 
-      element.addClass('activated');
-      $rootScope.$digest();
-      $animate.triggerReflow();
+          expect(capturedAnimationHistory.length).toBe(1);
 
-      $rootScope.onOff = true;
-      $rootScope.$digest();
+          $rootScope.$digest();
 
-      child = element.find('div');
-      expect(child).toHaveClass('ng-enter');
-      $animate.triggerReflow();
-      expect(child).toHaveClass('ng-enter-active');
+          expect(capturedAnimationHistory.length).toBe(2);
+        });
+      });
 
-      browserTrigger(child, 'transitionend',
-        { timeStamp: Date.now() + 1000, elapsedTime: 2000 });
+      they('should not cancel a post-digest $prop child animation if a class-based parent animation is set to run',
+        ['structural', 'class-based'], function(animationType) {
 
-      $animate.triggerCallbacks();
+        inject(function($rootScope, $animate, $$rAF) {
+          parent.append(element);
 
-      $rootScope.onOff = false;
-      $rootScope.$digest();
+          var child = jqLite('<div></div>');
+          if (animationType === 'structural') {
+            $animate.enter(child, element);
+          } else {
+            element.append(child);
+            $animate.addClass(child, 'test');
+          }
 
-      expect(child).toHaveClass('ng-leave');
-      $animate.triggerReflow();
-      expect(child).toHaveClass('ng-leave-active');
-    }));
+          $rootScope.$digest();
 
-    it("should cancel and perform the dom operation only after the reflow has run",
-      inject(function($compile, $rootScope, $animate, $sniffer) {
+          $animate.addClass(parent, 'abc');
 
-      if (!$sniffer.transitions) return;
+          expect(capturedAnimationHistory.length).toBe(1);
+          $rootScope.$digest();
 
-      ss.addRule('.green-add', '-webkit-transition:1s linear all;' +
-                                       'transition:1s linear all;');
+          expect(capturedAnimationHistory.length).toBe(2);
+        });
+      });
+    });
 
-      ss.addRule('.red-add', '-webkit-transition:1s linear all;' +
-                                     'transition:1s linear all;');
+    it("should NOT clobber all data on an element when animation is finished",
+      inject(function($animate, $rootScope) {
 
-      var element = $compile('<div></div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+      element.data('foo', 'bar');
 
-      $animate.addClass(element, 'green');
+      $animate.removeClass(element, 'ng-hide');
       $rootScope.$digest();
-      expect(element.hasClass('green-add')).toBe(true);
-
-      $animate.addClass(element, 'red');
+      $animate.addClass(element, 'ng-hide');
       $rootScope.$digest();
-      expect(element.hasClass('red-add')).toBe(true);
-
-      expect(element.hasClass('green')).toBe(false);
-      expect(element.hasClass('red')).toBe(false);
 
-      $animate.triggerReflow();
-
-      expect(element.hasClass('green')).toBe(true);
-      expect(element.hasClass('red')).toBe(true);
+      expect(element.data('foo')).toEqual('bar');
     }));
 
-    it("should properly add and remove CSS classes when multiple classes are applied",
-      inject(function($compile, $rootScope, $animate) {
-
-      $animate.enabled();
+    describe('child animations', function() {
+      it('should skip animations if the element is not attached to the $rootElement',
+        inject(function($compile, $rootScope, $animate) {
 
-      var exp = "{{ className ? 'before ' + className + ' after' : '' }}";
-      var element = $compile('<div class="' + exp + '"></div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
-
-      function assertClasses(str) {
-        var className = element.attr('class');
-        if (str.length === 0) {
-          expect(className.length).toBe(0);
-        } else {
-          expect(className.split(/\s+/)).toEqual(str.split(' '));
-        }
-      }
+        $animate.enabled(true);
 
-      $rootScope.className = '';
-      $rootScope.$digest();
-      $animate.triggerReflow();
+        var elm1 = $compile('<div class="animated"></div>')($rootScope);
 
-      assertClasses('');
+        expect(capturedAnimation).toBeFalsy();
+        $animate.addClass(elm1, 'klass2');
+        expect(capturedAnimation).toBeFalsy();
+        $rootScope.$digest();
+        expect(capturedAnimation).toBeFalsy();
+      }));
 
-      $rootScope.className = 'one';
-      $rootScope.$digest();
-      $animate.triggerReflow();
+      it('should skip animations if the element is attached to the $rootElement, but not apart of the body',
+        inject(function($compile, $rootScope, $animate, $rootElement) {
 
-      assertClasses('before one after');
+        $animate.enabled(true);
 
-      $rootScope.className = 'two';
-      $rootScope.$digest();
-      $animate.triggerReflow();
+        var elm1 = $compile('<div class="animated"></div>')($rootScope);
 
-      assertClasses('before after two');
+        var newParent = $compile('<div></div>')($rootScope);
+        newParent.append($rootElement);
+        $rootElement.append(elm1);
 
-      $rootScope.className = '';
-      $rootScope.$digest();
-      //intentionally avoiding the triggerReflow operation
+        expect(capturedAnimation).toBeFalsy();
+        $animate.addClass(elm1, 'klass2');
+        expect(capturedAnimation).toBeFalsy();
+        $rootScope.$digest();
+        expect(capturedAnimation).toBeFalsy();
+      }));
 
-      assertClasses('');
-    }));
+      it('should skip the animation if the element is removed from the DOM before the post digest kicks in',
+        inject(function($animate, $rootScope) {
 
-    it("should avoid mixing up substring classes during add and remove operations", function() {
-      var currentAnimation, currentFn;
-      module(function($animateProvider) {
-        $animateProvider.register('.on', function() {
-          return {
-            beforeAddClass: function(element, className, done) {
-              currentAnimation = 'addClass';
-              currentFn = done;
-              return function(cancelled) {
-                currentAnimation = cancelled ? null : currentAnimation;
-              };
-            },
-            beforeRemoveClass: function(element, className, done) {
-              currentAnimation = 'removeClass';
-              currentFn = done;
-              return function(cancelled) {
-                currentAnimation = cancelled ? null : currentAnimation;
-              };
-            }
-          };
-        });
-      });
-      inject(function($compile, $rootScope, $animate) {
-        var element = $compile('<div class="animation-enabled only"></div>')($rootScope);
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+        $animate.enter(element, parent);
+        expect(capturedAnimation).toBeFalsy();
 
-        $animate.addClass(element, 'on');
+        element.remove();
         $rootScope.$digest();
-        expect(currentAnimation).toBe('addClass');
-        currentFn();
+        expect(capturedAnimation).toBeFalsy();
+      }));
 
-        currentAnimation = null;
+      it('should be blocked when there is an ongoing structural parent animation occurring',
+        inject(function($rootScope, $rootElement, $animate) {
 
-        $animate.removeClass(element, 'on');
-        $rootScope.$digest();
+        parent.append(element);
 
-        $animate.addClass(element, 'on');
+        expect(capturedAnimation).toBeFalsy();
+        $animate.move(parent, parent2);
         $rootScope.$digest();
 
-        expect(currentAnimation).toBe('addClass');
-      });
-    });
-
-    it('should enable and disable animations properly on the root element', function() {
-      var count = 0;
-      module(function($animateProvider) {
-        $animateProvider.register('.animated', function() {
-          return {
-            addClass: function(element, className, done) {
-              count++;
-              done();
-            }
-          };
-        });
-      });
-      inject(function($compile, $rootScope, $animate, $sniffer, $rootElement) {
+        // yes the animation is going on
+        expect(capturedAnimation[0]).toBe(parent);
+        capturedAnimation = null;
 
-        $rootElement.addClass('animated');
-        $animate.addClass($rootElement, 'green');
+        $animate.addClass(element, 'blue');
         $rootScope.$digest();
-        $animate.triggerReflow();
+        expect(capturedAnimation).toBeFalsy();
+      }));
 
-        expect(count).toBe(1);
+      it("should disable all child animations for atleast one RAF when a structural animation is issued",
+        inject(function($animate, $rootScope, $compile, $$body, $rootElement, $$rAF, $$AnimateRunner) {
 
-        $animate.addClass($rootElement, 'red');
-        $rootScope.$digest();
-        $animate.triggerReflow();
+        element = $compile(
+          '<div><div class="if-animation" ng-if="items.length">' +
+          '  <div class="repeat-animation" ng-repeat="item in items">' +
+          '    {{ item }}' +
+          '  </div>' +
+          '</div></div>'
+        )($rootScope);
 
-        expect(count).toBe(2);
-      });
-    });
+        $$body.append($rootElement);
+        $rootElement.append(element);
 
+        var runner = new $$AnimateRunner();
+        overriddenAnimationRunner = runner;
 
-    it('should perform pre and post animations', function() {
-      var steps = [];
-      module(function($animateProvider) {
-        $animateProvider.register('.class-animate', function() {
-          return {
-            beforeAddClass: function(element, className, done) {
-              steps.push('before');
-              done();
-            },
-            addClass: function(element, className, done) {
-              steps.push('after');
-              done();
-            }
-          };
-        });
-      });
-      inject(function($animate, $rootScope, $compile, $rootElement) {
-        $animate.enabled(true);
+        $rootScope.items = [1];
+        $rootScope.$digest();
 
-        var element = $compile('<div class="class-animate"></div>')($rootScope);
-        $rootElement.append(element);
+        expect(capturedAnimation[0]).toHaveClass('if-animation');
+        expect(capturedAnimationHistory.length).toBe(1);
+        expect(element[0].querySelectorAll('.repeat-animation').length).toBe(1);
 
-        $animate.addClass(element, 'red');
+        $rootScope.items = [1, 2];
         $rootScope.$digest();
 
-        $animate.triggerReflow();
+        expect(capturedAnimation[0]).toHaveClass('if-animation');
+        expect(capturedAnimationHistory.length).toBe(1);
+        expect(element[0].querySelectorAll('.repeat-animation').length).toBe(2);
 
-        expect(steps).toEqual(['before','after']);
-      });
-    });
+        runner.end();
+        $$rAF.flush();
+
+        $rootScope.items = [1, 2, 3];
+        $rootScope.$digest();
 
+        expect(capturedAnimation[0]).toHaveClass('repeat-animation');
+        expect(capturedAnimationHistory.length).toBe(2);
+        expect(element[0].querySelectorAll('.repeat-animation').length).toBe(3);
+      }));
 
-    it('should treat the leave event always as a before event and discard the beforeLeave function', function() {
-      var parentID, steps = [];
-      module(function($animateProvider) {
-        $animateProvider.register('.animate', function() {
-          return {
-            beforeLeave: function(element, done) {
-              steps.push('before');
-              done();
-            },
-            leave: function(element, done) {
-              parentID = element.parent().attr('id');
-              steps.push('after');
-              done();
-            }
-          };
-        });
-      });
-      inject(function($animate, $rootScope, $compile, $rootElement) {
-        $animate.enabled(true);
+      it('should not be blocked when there is an ongoing class-based parent animation occurring',
+        inject(function($rootScope, $rootElement, $animate) {
 
-        var element = $compile('<div id="parentGuy"></div>')($rootScope);
-        var child = $compile('<div class="animate"></div>')($rootScope);
-        $rootElement.append(element);
-        element.append(child);
+        parent.append(element);
 
-        $animate.leave(child);
+        expect(capturedAnimation).toBeFalsy();
+        $animate.addClass(parent, 'rogers');
         $rootScope.$digest();
 
-        expect(steps).toEqual(['after']);
-        expect(parentID).toEqual('parentGuy');
-      });
-    });
+        // yes the animation is going on
+        expect(capturedAnimation[0]).toBe(parent);
+        capturedAnimation = null;
 
+        $animate.addClass(element, 'blue');
+        $rootScope.$digest();
+        expect(capturedAnimation[0]).toBe(element);
+      }));
 
-    it('should only perform the DOM operation once',
-      inject(function($sniffer, $compile, $rootScope, $rootElement, $animate) {
+      it('should skip all pre-digest queued child animations when a parent structural animation is triggered',
+        inject(function($rootScope, $rootElement, $animate) {
 
-      if (!$sniffer.transitions) return;
+        parent.append(element);
 
-      ss.addRule('.base-class', '-webkit-transition:1s linear all;' +
-                                        'transition:1s linear all;');
+        $animate.addClass(element, 'rumlow');
+        $animate.move(parent, null, parent2);
 
-      $animate.enabled(true);
+        expect(capturedAnimation).toBeFalsy();
+        expect(capturedAnimationHistory.length).toBe(0);
+        $rootScope.$digest();
 
-      var element = $compile('<div class="base-class one two"></div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+        expect(capturedAnimation[0]).toBe(parent);
+        expect(capturedAnimationHistory.length).toBe(1);
+      }));
 
-      $animate.removeClass(element, 'base-class one two');
-      $rootScope.$digest();
+      it('should end all ongoing post-digest child animations when a parent structural animation is triggered',
+        inject(function($rootScope, $rootElement, $animate) {
 
-      //still true since we're before the reflow
-      expect(element.hasClass('base-class')).toBe(true);
+        parent.append(element);
 
-      //this will cancel the remove animation
-      $animate.addClass(element, 'base-class one two');
-      $rootScope.$digest();
+        $animate.addClass(element, 'rumlow');
+        var isCancelled = false;
+        overriddenAnimationRunner = extend(defaultFakeAnimationRunner, {
+          end: function() {
+            isCancelled = true;
+          }
+        });
 
-      //the cancellation was a success and the class was removed right away
-      expect(element.hasClass('base-class')).toBe(false);
+        $rootScope.$digest();
+        expect(capturedAnimation[0]).toBe(element);
+        expect(isCancelled).toBe(false);
 
-      //the reflow...
-      $animate.triggerReflow();
+        // restore the default
+        overriddenAnimationRunner = defaultFakeAnimationRunner;
+        $animate.move(parent, null, parent2);
+        $rootScope.$digest();
+        expect(capturedAnimation[0]).toBe(parent);
 
-      //the reflow DOM operation was commenced...
-      expect(element.hasClass('base-class')).toBe(true);
-    }));
+        expect(isCancelled).toBe(true);
+      }));
 
+      it('should not end any child animations if a parent class-based animation is issued',
+        inject(function($rootScope, $rootElement, $animate) {
 
-    it('should block and unblock transitions before the dom operation occurs',
-      inject(function($rootScope, $compile, $rootElement, $document, $animate, $sniffer) {
+        parent.append(element);
 
-      if (!$sniffer.transitions) return;
+        var element2 = jqLite('<div>element2</div>');
+        $animate.enter(element2, parent);
 
-      $animate.enabled(true);
+        var isCancelled = false;
+        overriddenAnimationRunner = extend(defaultFakeAnimationRunner, {
+          end: function() {
+            isCancelled = true;
+          }
+        });
 
-      ss.addRule('.cross-animation', '-webkit-transition:1s linear all;' +
-                                             'transition:1s linear all;');
+        $rootScope.$digest();
+        expect(capturedAnimation[0]).toBe(element2);
+        expect(isCancelled).toBe(false);
 
-      var capturedProperty = 'none';
+        // restore the default
+        overriddenAnimationRunner = defaultFakeAnimationRunner;
+        $animate.addClass(parent, 'peter');
+        $rootScope.$digest();
+        expect(capturedAnimation[0]).toBe(parent);
 
-      var element = $compile('<div class="cross-animation"></div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+        expect(isCancelled).toBe(false);
+      }));
 
-      var node = element[0];
-      node._setAttribute = node.setAttribute;
-      node.setAttribute = function(prop, val) {
-        if (prop == 'class' && val.indexOf('trigger-class') >= 0) {
-          var propertyKey = ($sniffer.vendorPrefix == 'Webkit' ? '-webkit-' : '') + 'transition-property';
-          capturedProperty = element.css(propertyKey);
-        }
-        node._setAttribute(prop, val);
-      };
+      it('should allow follow-up class-based animations to run in parallel on the same element',
+        inject(function($rootScope, $animate, $$rAF) {
 
-      expect(capturedProperty).toBe('none');
-      $animate.addClass(element, 'trigger-class');
-      $rootScope.$digest();
+        parent.append(element);
 
-      $animate.triggerReflow();
+        var runner1done = false;
+        var runner1 = $animate.addClass(element, 'red');
+        runner1.done(function() {
+          runner1done = true;
+        });
 
-      expect(capturedProperty).not.toBe('none');
-    }));
+        $rootScope.$digest();
+        $$rAF.flush();
+        expect(capturedAnimation).toBeTruthy();
+        expect(runner1done).toBeFalsy();
 
+        capturedAnimation = null;
 
-    it('should not block keyframe animations around the reflow operation',
-      inject(function($rootScope, $compile, $rootElement, $document, $animate, $sniffer) {
+        // make sure it's a different runner
+        overriddenAnimationRunner = extend(defaultFakeAnimationRunner, {
+          end: function() {
+            // this code will still end the animation, just not at any deeper level
+          }
+        });
 
-      if (!$sniffer.animations) return;
+        var runner2done = false;
+        var runner2 = $animate.addClass(element, 'blue');
+        runner2.done(function() {
+          runner2done = true;
+        });
 
-      $animate.enabled(true);
+        $rootScope.$digest();
+        $$rAF.flush();
+        expect(capturedAnimation).toBeTruthy();
+        expect(runner2done).toBeFalsy();
 
-      ss.addRule('.cross-animation', '-webkit-animation:1s my_animation;' +
-                                             'animation:1s my_animation;');
+        expect(runner1done).toBeFalsy();
 
-      var element = $compile('<div class="cross-animation"></div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+        runner2.end();
 
-      var node = element[0];
-      var animationKey = $sniffer.vendorPrefix == 'Webkit' ? 'WebkitAnimation' : 'animation';
+        expect(runner2done).toBeTruthy();
+        expect(runner1done).toBeFalsy();
+      }));
 
-      $animate.addClass(element, 'trigger-class');
-      $rootScope.$digest();
+      it('should remove the animation block on child animations once the parent animation is complete',
+        inject(function($rootScope, $rootElement, $animate, $$AnimateRunner, $$rAF) {
 
-      expect(node.style[animationKey]).not.toContain('none');
+        var runner = new $$AnimateRunner();
+        overriddenAnimationRunner = runner;
+        parent.append(element);
 
-      $animate.triggerReflow();
+        $animate.enter(parent, null, parent2);
+        $rootScope.$digest();
+        expect(capturedAnimationHistory.length).toBe(1);
 
-      expect(node.style[animationKey]).not.toContain('none');
+        $animate.addClass(element, 'tony');
+        $rootScope.$digest();
+        expect(capturedAnimationHistory.length).toBe(1);
 
-      browserTrigger(element, 'animationend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
+        runner.end();
+        $$rAF.flush();
 
-      expect(node.style[animationKey]).not.toContain('none');
-    }));
+        $animate.addClass(element, 'stark');
+        $rootScope.$digest();
+        expect(capturedAnimationHistory.length).toBe(2);
+      }));
+    });
 
+    describe('cancellations', function() {
+      it('should cancel the previous animation if a follow-up structural animation takes over',
+        inject(function($animate, $rootScope) {
 
-    it('should not block keyframe animations at anytime before a followup JS animation occurs', function() {
-      module(function($animateProvider) {
-        $animateProvider.register('.special', function($sniffer, $window) {
-          var prop = $sniffer.vendorPrefix == 'Webkit' ? 'WebkitAnimation' : 'animation';
-          return {
-            beforeAddClass: function(element, className, done) {
-              expect(element[0].style[prop]).not.toContain('none');
-              expect($window.getComputedStyle(element[0])[prop + 'Duration']).toBe('1s');
-              done();
-            },
-            addClass: function(element, className, done) {
-              expect(element[0].style[prop]).not.toContain('none');
-              expect($window.getComputedStyle(element[0])[prop + 'Duration']).toBe('1s');
-              done();
-            }
-          };
+        var enterComplete = false;
+        overriddenAnimationRunner = extend(defaultFakeAnimationRunner, {
+          end: function() {
+            enterComplete = true;
+          }
         });
-      });
-      inject(function($rootScope, $compile, $rootElement, $document, $animate, $sniffer, $timeout, $window) {
-        if (!$sniffer.animations) return;
-
-        $animate.enabled(true);
 
-        ss.addRule('.special', '-webkit-animation:1s special_animation;' +
-                                       'animation:1s special_animation;');
+        parent.append(element);
+        $animate.move(element, parent2);
 
-        var element = $compile('<div class="special"></div>')($rootScope);
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+        $rootScope.$digest();
+        expect(enterComplete).toBe(false);
 
-        $animate.addClass(element, 'some-klass');
+        $animate.leave(element);
         $rootScope.$digest();
+        expect(enterComplete).toBe(true);
+      }));
 
-        var prop = $sniffer.vendorPrefix == 'Webkit' ? 'WebkitAnimation' : 'animation';
+      it('should cancel the previous structural animation if a follow-up structural animation takes over before the postDigest',
+        inject(function($animate, $$rAF) {
 
-        expect(element[0].style[prop]).not.toContain('none');
-        expect($window.getComputedStyle(element[0])[prop + 'Duration']).toBe('1s');
+        var enterDone = jasmine.createSpy('enter animation done');
+        $animate.enter(element, parent).done(enterDone);
+        expect(enterDone).not.toHaveBeenCalled();
 
-        $animate.triggerReflow();
-      });
-    });
+        $animate.leave(element);
+        $$rAF.flush();
+        expect(enterDone).toHaveBeenCalled();
+      }));
 
+      it('should cancel the previously running addClass animation if a follow-up removeClass animation is using the same class value',
+        inject(function($animate, $rootScope, $$rAF) {
 
-    it('should round up long elapsedTime values to close off a CSS3 animation',
-      inject(function($rootScope, $compile, $rootElement, $document, $animate, $sniffer) {
-        if (!$sniffer.animations) return;
+        parent.append(element);
+        var runner = $animate.addClass(element, 'active-class');
+        $rootScope.$digest();
 
-        ss.addRule('.millisecond-transition.ng-leave', '-webkit-transition:510ms linear all;' +
-                                                       'transition:510ms linear all;');
+        var doneHandler = jasmine.createSpy('addClass done');
+        runner.done(doneHandler);
 
-        var element = $compile('<div class="millisecond-transition"></div>')($rootScope);
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+        $$rAF.flush();
 
-        $animate.leave(element);
+        expect(doneHandler).not.toHaveBeenCalled();
+
+        $animate.removeClass(element, 'active-class');
         $rootScope.$digest();
 
-        $animate.triggerReflow();
+        expect(doneHandler).toHaveBeenCalled();
+      }));
+
+      it('should cancel the previously running removeClass animation if a follow-up addClass animation is using the same class value',
+        inject(function($animate, $rootScope, $$rAF) {
 
-        browserTrigger(element, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 0.50999999991 });
+        element.addClass('active-class');
+        parent.append(element);
+        var runner = $animate.removeClass(element, 'active-class');
+        $rootScope.$digest();
 
-        expect($rootElement.children().length).toBe(0);
-      })
-    );
+        var doneHandler = jasmine.createSpy('addClass done');
+        runner.done(doneHandler);
 
+        $$rAF.flush();
 
-    it('should properly animate elements with compound directives', function() {
-      var capturedAnimation;
-      module(function($animateProvider) {
-        $animateProvider.register('.special', function() {
-          return {
-            enter: function(element, done) {
-              capturedAnimation = 'enter';
-              done();
-            },
-            leave: function(element, done) {
-              capturedAnimation = 'leave';
-              done();
-            }
-          };
-        });
-      });
-      inject(function($rootScope, $compile, $rootElement, $document, $timeout, $templateCache, $sniffer, $animate) {
-        if (!$sniffer.transitions) return;
+        expect(doneHandler).not.toHaveBeenCalled();
 
-        $templateCache.put('item-template', 'item: #{{ item }} ');
-        var element = $compile('<div>' +
-                               ' <div ng-repeat="item in items"' +
-                               '      ng-include="tpl"' +
-                               '      class="special"></div>' +
-                               '</div>')($rootScope);
+        $animate.addClass(element, 'active-class');
+        $rootScope.$digest();
 
-        ss.addRule('.special', '-webkit-transition:1s linear all;' +
-                                       'transition:1s linear all;');
+        expect(doneHandler).toHaveBeenCalled();
+      }));
 
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+      it('should immediately skip the class-based animation if there is an active structural animation',
+        inject(function($animate, $rootScope) {
 
-        $rootScope.tpl = 'item-template';
-        $rootScope.items = [1,2,3];
+        $animate.enter(element, parent);
         $rootScope.$digest();
-        $animate.triggerReflow();
+        expect(capturedAnimation).toBeTruthy();
+
+        capturedAnimation = null;
+        $animate.addClass(element, 'red');
+        expect(element).toHaveClass('red');
+      }));
+
+      it('should join the class-based animation into the structural animation if the structural animation is pre-digest',
+        inject(function($animate, $rootScope) {
 
-        expect(capturedAnimation).toBe('enter');
-        expect(element.text()).toContain('item: #1');
+        $animate.enter(element, parent);
+        expect(capturedAnimation).toBeFalsy();
 
-        forEach(element.children(), function(kid) {
-          browserTrigger(kid, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
-        });
-        $animate.triggerCallbackPromise();
+        $animate.addClass(element, 'red');
+        expect(element).not.toHaveClass('red');
 
-        $rootScope.items = [];
+        expect(capturedAnimation).toBeFalsy();
         $rootScope.$digest();
-        $animate.triggerReflow();
 
-        expect(capturedAnimation).toBe('leave');
-      });
-    });
+        expect(capturedAnimation[1]).toBe('enter');
+        expect(capturedAnimation[2].addClass).toBe('red');
+      }));
 
-    it('should animate only the specified CSS className', function() {
-      var captures = {};
-      module(function($animateProvider) {
-        $animateProvider.classNameFilter(/prefixed-animation/);
-        $animateProvider.register('.capture', function() {
-          return {
-            enter: buildFn('enter'),
-            leave: buildFn('leave')
-          };
-
-          function buildFn(key) {
-            return function(element, className, done) {
-              captures[key] = true;
-              (done || className)();
-            };
-          }
-        });
-      });
-      inject(function($rootScope, $compile, $rootElement, $document, $timeout, $templateCache, $sniffer, $animate) {
-        if (!$sniffer.transitions) return;
+      it('should issue a new runner instance if a previous structural animation was cancelled',
+        inject(function($animate, $rootScope) {
 
-        var element = $compile('<div class="capture"></div>')($rootScope);
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+        parent.append(element);
 
-        var enterDone = false;
-        $animate.enter(element, $rootElement).then(function() {
-          enterDone = true;
-        });
+        var runner1 = $animate.move(element, parent2);
+        $rootScope.$digest();
 
+        var runner2 = $animate.leave(element);
         $rootScope.$digest();
-        $animate.triggerCallbackPromise();
 
-        expect(captures['enter']).toBeUndefined();
-        expect(enterDone).toBe(true);
+        expect(runner1).not.toBe(runner2);
+      }));
 
-        element.addClass('prefixed-animation');
+      it('should properly cancel out animations when the same class is added/removed within the same digest',
+        inject(function($animate, $rootScope) {
 
-        var leaveDone = false;
-        $animate.leave(element).then(function() {
-          leaveDone = true;
-        });
+        parent.append(element);
+        $animate.addClass(element, 'red');
+        $animate.removeClass(element, 'red');
+        $rootScope.$digest();
+
+        expect(capturedAnimation).toBeFalsy();
 
+        $animate.addClass(element, 'blue');
         $rootScope.$digest();
-        $animate.triggerCallbackPromise();
 
-        expect(captures['leave']).toBe(true);
-        expect(leaveDone).toBe(true);
-      });
+        expect(capturedAnimation[2].addClass).toBe('blue');
+      }));
     });
 
-    it('should animate only the specified CSS className inside ng-if', function() {
-      var captures = {};
-      module(function($animateProvider) {
-        $animateProvider.classNameFilter(/prefixed-animation/);
-        $animateProvider.register('.capture', function() {
-          return {
-            enter: buildFn('enter'),
-            leave: buildFn('leave')
-          };
-
-          function buildFn(key) {
-            return function(element, className, done) {
-              captures[key] = true;
-              (done || className)();
-            };
-          }
-        });
-      });
-      inject(function($rootScope, $compile, $rootElement, $document, $sniffer, $animate) {
-        if (!$sniffer.transitions) return;
+    describe('should merge', function() {
+      it('multiple class-based animations together into one before the digest passes', inject(function($animate, $rootScope) {
+        parent.append(element);
+        element.addClass('green');
 
-        var upperElement = $compile('<div><div ng-if=1><span class="capture prefixed-animation"></span></div></div>')($rootScope);
-        $rootElement.append(upperElement);
-        jqLite($document[0].body).append($rootElement);
+        $animate.addClass(element, 'red');
+        $animate.addClass(element, 'blue');
+        $animate.removeClass(element, 'green');
 
         $rootScope.$digest();
-        $animate.triggerCallbacks();
 
-        var element = upperElement.find('span');
+        expect(capturedAnimation[0]).toBe(element);
+        expect(capturedAnimation[1]).toBe('setClass');
 
-        var leaveDone = false;
-        $animate.leave(element).then(function() {
-          leaveDone = true;
-        });
+        options = capturedAnimation[2];
+        expect(options.addClass).toEqual('red blue');
+        expect(options.removeClass).toEqual('green');
 
-        $rootScope.$digest();
-        $animate.triggerCallbacks();
+        expect(element).not.toHaveClass('red');
+        expect(element).not.toHaveClass('blue');
+        expect(element).toHaveClass('green');
 
-        expect(captures.leave).toBe(true);
-        expect(leaveDone).toBe(true);
-      });
-    });
+        applyAnimationClasses(element, capturedAnimation[2]);
+
+        expect(element).toHaveClass('red');
+        expect(element).toHaveClass('blue');
+        expect(element).not.toHaveClass('green');
+      }));
 
-    it('should respect the most relevant CSS transition property if defined in multiple classes',
-      inject(function($sniffer, $compile, $rootScope, $rootElement, $animate) {
+      it('multiple class-based animations together into a single structural event before the digest passes', inject(function($animate, $rootScope) {
+        element.addClass('green');
 
-      if (!$sniffer.transitions) return;
+        expect(element.parent().length).toBe(0);
+        $animate.enter(element, parent);
+        expect(element.parent().length).toBe(1);
 
-      ss.addRule('.base-class', '-webkit-transition:1s linear all;' +
-                                        'transition:1s linear all;');
+        $animate.addClass(element, 'red');
+        $animate.removeClass(element, 'green');
 
-      ss.addRule('.base-class.on', '-webkit-transition:5s linear all;' +
-                                           'transition:5s linear all;');
+        $rootScope.$digest();
 
-      $animate.enabled(true);
+        expect(capturedAnimation[0]).toBe(element);
+        expect(capturedAnimation[1]).toBe('enter');
 
-      var element = $compile('<div class="base-class"></div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+        options = capturedAnimation[2];
+        expect(options.addClass).toEqual('red');
+        expect(options.removeClass).toEqual('green');
 
-      var ready = false;
-      $animate.addClass(element, 'on').then(function() {
-        ready = true;
-      });
-      $rootScope.$digest();
+        expect(element).not.toHaveClass('red');
+        expect(element).toHaveClass('green');
 
-      $animate.triggerReflow();
-      browserTrigger(element, 'transitionend', { timeStamp: Date.now(), elapsedTime: 1 });
-      expect(ready).toBe(false);
+        applyAnimationClasses(element, capturedAnimation[2]);
 
-      browserTrigger(element, 'transitionend', { timeStamp: Date.now(), elapsedTime: 5 });
-      $animate.triggerReflow();
-      $animate.triggerCallbackPromise();
-      expect(ready).toBe(true);
+        expect(element).toHaveClass('red');
+        expect(element).not.toHaveClass('green');
+      }));
 
-      ready = false;
-      $animate.removeClass(element, 'on').then(function() {
-        ready = true;
-      });
-      $rootScope.$digest();
+      it('should automatically cancel out class-based animations if the element already contains or doesn\' contain the applied classes',
+        inject(function($animate, $rootScope) {
 
-      $animate.triggerReflow();
-      browserTrigger(element, 'transitionend', { timeStamp: Date.now(), elapsedTime: 1 });
-      $animate.triggerCallbackPromise();
-      expect(ready).toBe(true);
-    }));
+        parent.append(element);
+        element.addClass('one three');
 
-    it('should not apply a transition upon removal of a class that has a transition',
-      inject(function($sniffer, $compile, $rootScope, $rootElement, $animate) {
+        $animate.addClass(element, 'one');
+        $animate.addClass(element, 'two');
+        $animate.removeClass(element, 'three');
+        $animate.removeClass(element, 'four');
 
-      if (!$sniffer.transitions) return;
+        $rootScope.$digest();
 
-      ss.addRule('.base-class.on', '-webkit-transition:5s linear all;' +
-                                           'transition:5s linear all;');
+        options = capturedAnimation[2];
+        expect(options.addClass).toEqual('two');
+        expect(options.removeClass).toEqual('three');
+      }));
 
-      $animate.enabled(true);
+      it('and skip the animation entirely if no class-based animations remain and if there is no structural animation applied',
+        inject(function($animate, $rootScope) {
 
-      var element = $compile('<div class="base-class on"></div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+        parent.append(element);
+        element.addClass('one three');
 
-      var ready = false;
-      $animate.removeClass(element, 'on').then(function() {
-        ready = true;
-      });
-      $rootScope.$digest();
+        $animate.addClass(element, 'one');
+        $animate.removeClass(element, 'four');
 
-      $animate.triggerReflow();
-      $animate.triggerCallbackPromise();
-      expect(ready).toBe(true);
-    }));
+        $rootScope.$digest();
+        expect(capturedAnimation).toBeFalsy();
+      }));
 
-    it('should immediately close the former animation if the same CSS class is added/removed',
-      inject(function($sniffer, $compile, $rootScope, $rootElement, $animate) {
+      it('but not skip the animation if it is a structural animation and if there are no classes to be animated',
+        inject(function($animate, $rootScope) {
 
-      if (!$sniffer.transitions) return;
+        element.addClass('one three');
 
-      ss.addRule('.water-class', '-webkit-transition:2s linear all;' +
-                                         'transition:2s linear all;');
+        $animate.addClass(element, 'one');
+        $animate.removeClass(element, 'four');
+        $animate.enter(element, parent);
 
-      $animate.enabled(true);
+        $rootScope.$digest();
 
-      var element = $compile('<div class="water-class on"></div>')($rootScope);
-      $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+        expect(capturedAnimation[1]).toBe('enter');
+      }));
 
-      var signature = '';
-      $animate.removeClass(element, 'on').then(function() {
-        signature += 'A';
-      });
-      $rootScope.$digest();
+      it('class-based animations, however it should also cancel former structural animations in the process',
+        inject(function($animate, $rootScope) {
 
-      $animate.addClass(element, 'on').then(function() {
-        signature += 'B';
-      });
-      $rootScope.$digest();
+        element.addClass('green lime');
 
-      $animate.triggerReflow();
-      $animate.triggerCallbackPromise();
-      expect(signature).toBe('A');
+        $animate.enter(element, parent);
+        $animate.addClass(element, 'red');
+        $animate.removeClass(element, 'green');
 
-      browserTrigger(element, 'transitionend', { timeStamp: Date.now(), elapsedTime: 2000 });
-      $animate.triggerCallbackPromise();
+        $animate.leave(element);
+        $animate.addClass(element, 'pink');
+        $animate.removeClass(element, 'lime');
 
-      expect(signature).toBe('AB');
-    }));
+        expect(element).toHaveClass('red');
+        expect(element).not.toHaveClass('green');
+        expect(element).not.toHaveClass('pink');
+        expect(element).toHaveClass('lime');
 
-    it('should cancel the previous reflow when new animations are added', function() {
-      var cancelReflowCallback = jasmine.createSpy('callback');
-      module(function($provide) {
-        $provide.value('$$animateReflow', function() {
-          return cancelReflowCallback;
-        });
-      });
-      inject(function($animate, $sniffer, $rootScope, $compile) {
-        if (!$sniffer.transitions) return;
+        $rootScope.$digest();
 
-        ss.addRule('.fly', '-webkit-transition:2s linear all;' +
-                                   'transition:2s linear all;');
+        expect(capturedAnimation[0]).toBe(element);
+        expect(capturedAnimation[1]).toBe('leave');
 
-        $animate.enabled(true);
+        // $$hashKey causes comparison issues
+        expect(element.parent()[0]).toEqual(parent[0]);
 
-        var element = $compile('<div class="fly"></div>')($rootScope);
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+        options = capturedAnimation[2];
+        expect(options.addClass).toEqual('pink');
+        expect(options.removeClass).toEqual('lime');
+      }));
 
-        expect(cancelReflowCallback).not.toHaveBeenCalled();
+      it('should retain the instance to the very first runner object when multiple element-level animations are issued',
+        inject(function($animate, $rootScope) {
 
-        $animate.addClass(element, 'fast');
-        $rootScope.$digest();
+        element.addClass('green');
 
-        $animate.addClass(element, 'smooth');
-        $rootScope.$digest();
-        $animate.triggerReflow();
+        var r1 = $animate.enter(element, parent);
+        var r2 = $animate.addClass(element, 'red');
+        var r3 = $animate.removeClass(element, 'green');
 
-        expect(cancelReflowCallback).toHaveBeenCalled();
-      });
-    });
+        expect(r1).toBe(r2);
+        expect(r2).toBe(r3);
+      }));
 
-    it('should immediately close off a leave animation if the element is removed from the DOM', function() {
-      var stat;
-      module(function($animateProvider) {
-        $animateProvider.register('.going', function() {
-          return {
-            leave: function() {
-              //left blank so it hangs
-              stat = 'leaving';
-              return function(cancelled) {
-                stat = cancelled && 'gone';
-              };
-            }
-          };
-        });
-      });
-      inject(function($sniffer, $compile, $rootScope, $rootElement, $animate) {
+      it('should not skip or miss the animations when animations are executed sequential',
+        inject(function($animate, $rootScope, $$rAF, $rootElement) {
 
-        $animate.enabled(true);
+        element = jqLite('<div></div>');
 
-        var element = $compile('<div id="parentGuy"></div>')($rootScope);
-        var child = $compile('<div class="going"></div>')($rootScope);
         $rootElement.append(element);
-        element.append(child);
 
-        $animate.leave(child);
+        $animate.addClass(element, 'rclass');
+        $animate.removeClass(element, 'rclass');
+        $animate.addClass(element, 'rclass');
+        $animate.removeClass(element, 'rclass');
+
         $rootScope.$digest();
+        $$rAF.flush();
 
-        expect(stat).toBe('leaving');
+        expect(element).not.toHaveClass('rclass');
+      }));
+    });
+  });
 
-        child.remove();
+  they('should allow an animation to run on the $prop element', ['$rootElement', 'body'], function(name) {
+    var capturedAnimation;
 
-        expect(stat).toBe('gone');
+    module(function($provide) {
+      $provide.factory('$rootElement', function($document) {
+        return jqLite($document[0].querySelector('html'));
+      });
+      $provide.factory('$$animation', function($$AnimateRunner) {
+        return function(element, method, options) {
+          capturedAnimation = arguments;
+          return new $$AnimateRunner();
+        };
       });
     });
+    inject(function($animate, $rootScope, $document, $rootElement) {
+      $animate.enabled(true);
 
-    it('should remove all element and comment nodes during leave animation',
-      inject(function($compile, $rootScope) {
-
-      $rootScope.items = [1,2,3,4,5];
-
-      var element = html($compile(
-        '<div>' +
-        '  <div class="animated" ng-repeat-start="item in items">start</div>' +
-        '  <div ng-repeat-end>end</div>' +
-        '</div>'
-      )($rootScope));
+      var body = jqLite($document[0].body);
+      var targetElement = name === 'body' ? body : $rootElement;
 
+      $animate.addClass(targetElement, 'red');
       $rootScope.$digest();
 
-      $rootScope.items = [];
-
-      $rootScope.$digest();
+      expect(capturedAnimation[0]).toBe(targetElement);
+      expect(capturedAnimation[1]).toBe('addClass');
+    });
+  });
 
-      expect(element.children().length).toBe(0);
+  describe('[ng-animate-children]', function() {
+    var parent, element, child, capturedAnimation, captureLog;
+    beforeEach(module(function($provide) {
+      capturedAnimation = null;
+      captureLog = [];
+      $provide.factory('$$animation', function($$AnimateRunner) {
+        return function(element, method, options) {
+          options.domOperation();
+          captureLog.push(capturedAnimation = arguments);
+          return new $$AnimateRunner();
+        };
+      });
+      return function($rootElement, $$body, $animate) {
+        $$body.append($rootElement);
+        parent  = jqLite('<div class="parent"></div>');
+        element = jqLite('<div class="element"></div>');
+        child   = jqLite('<div class="child"></div>');
+        $animate.enabled(true);
+      };
     }));
 
-    it('should not throw an error when only comment nodes are rendered in the animation',
-      inject(function($rootScope, $compile) {
+    it('should allow child animations to run when the attribute is used',
+      inject(function($animate, $rootScope, $rootElement, $compile) {
 
-      $rootScope.items = [1,2,3,4,5];
+      $animate.enter(parent, $rootElement);
+      $animate.enter(element, parent);
+      $animate.enter(child, element);
+      $rootScope.$digest();
+      expect(captureLog.length).toBe(1);
 
-      var element = html($compile('<div><div class="animated" ng-if="valid" ng-repeat="item in items"></div></div>')($rootScope));
+      captureLog = [];
 
+      parent.attr('ng-animate-children', '');
+      $compile(parent)($rootScope);
       $rootScope.$digest();
 
-      $rootScope.items = [];
-
+      $animate.enter(parent, $rootElement);
       $rootScope.$digest();
+      expect(captureLog.length).toBe(1);
 
-      expect(element.children().length).toBe(0);
+      $animate.enter(element, parent);
+      $animate.enter(child, element);
+      $rootScope.$digest();
+      expect(captureLog.length).toBe(3);
     }));
 
-    describe('ngAnimateChildren', function() {
-      var spy;
-
-      beforeEach(module(function($animateProvider) {
-        spy = jasmine.createSpy();
-        $animateProvider.register('.parent', mockAnimate);
-        $animateProvider.register('.child', mockAnimate);
-        return function($animate) {
-          $animate.enabled(true);
-        };
+    it('should fully disallow all parallel child animations from running if `off` is used',
+      inject(function($animate, $rootScope, $rootElement, $compile) {
 
-        function mockAnimate() {
-          return {
-            enter: spy,
-            leave: spy,
-            addClass: spy,
-            removeClass: spy
-          };
-        }
-      }));
+      $rootElement.append(parent);
+      parent.append(element);
+      element.append(child);
 
-      it('should animate based on a boolean flag', inject(function($animate, $sniffer, $rootScope, $compile) {
-        var html = '<section class="parent" ng-if="on1" ng-animate-children="bool">' +
-                   '  <div class="child" ng-if="on2">...</div>' +
-                   '</section>';
+      parent.attr('ng-animate-children', 'off');
+      element.attr('ng-animate-children', 'on');
 
-        var element = $compile(html)($rootScope);
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+      $compile(parent)($rootScope);
+      $compile(element)($rootScope);
+      $rootScope.$digest();
 
-        var scope = $rootScope;
+      $animate.leave(parent);
+      $animate.leave(element);
+      $animate.leave(child);
+      $rootScope.$digest();
 
-        scope.bool = true;
-        scope.$digest();
+      expect(captureLog.length).toBe(1);
 
-        scope.on1 = true;
-        scope.on2 = true;
-        scope.$digest();
+      dealoc(element);
+      dealoc(child);
+    }));
 
-        $animate.triggerReflow();
+    it('should watch to see if the ng-animate-children attribute changes',
+      inject(function($animate, $rootScope, $rootElement, $compile) {
 
-        expect(spy).toHaveBeenCalled();
-        expect(spy.callCount).toBe(2);
+      $rootElement.append(parent);
+      $rootScope.val = 'on';
+      parent.attr('ng-animate-children', '{{ val }}');
+      $compile(parent)($rootScope);
+      $rootScope.$digest();
 
-        scope.bool = false;
-        scope.$digest();
+      $animate.enter(parent, $rootElement);
+      $animate.enter(element, parent);
+      $animate.enter(child, element);
+      $rootScope.$digest();
+      expect(captureLog.length).toBe(3);
 
-        scope.on1 = false;
-        scope.$digest();
+      captureLog = [];
 
-        scope.on2 = false;
-        scope.$digest();
+      $rootScope.val = 'off';
+      $rootScope.$digest();
 
-        $animate.triggerReflow();
+      $animate.leave(parent);
+      $animate.leave(element);
+      $animate.leave(child);
+      $rootScope.$digest();
 
-        expect(spy.callCount).toBe(3);
-      }));
+      expect(captureLog.length).toBe(1);
 
-      it('should default to true when no expression is provided',
-        inject(function($animate, $sniffer, $rootScope, $compile) {
+      dealoc(element);
+      dealoc(child);
+    }));
+  });
 
-        var html = '<section class="parent" ng-if="on1" ng-animate-children>' +
-                   '  <div class="child" ng-if="on2">...</div>' +
-                   '</section>';
+  describe('.pin()', function() {
+    var capturedAnimation;
 
-        var element = $compile(html)($rootScope);
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+    beforeEach(module(function($provide) {
+      capturedAnimation = null;
+      $provide.factory('$$animation', function($$AnimateRunner) {
+        return function() {
+          capturedAnimation = arguments;
+          return new $$AnimateRunner();
+        };
+      });
+    }));
 
-        $rootScope.on1 = true;
-        $rootScope.$digest();
+    it('should allow an element to pinned elsewhere and still be available in animations',
+      inject(function($animate, $compile, $$body, $rootElement, $rootScope) {
 
-        $rootScope.on2 = true;
-        $rootScope.$digest();
+      var innerParent = jqLite('<div></div>');
+      $$body.append(innerParent);
+      innerParent.append($rootElement);
 
-        $animate.triggerReflow();
+      var element = jqLite('<div></div>');
+      $$body.append(element);
 
-        expect(spy).toHaveBeenCalled();
-        expect(spy.callCount).toBe(2);
-      }));
+      $animate.addClass(element, 'red');
+      $rootScope.$digest();
+      expect(capturedAnimation).toBeFalsy();
 
-      it('should not perform inherited animations if any parent restricts it',
-        inject(function($animate, $sniffer, $rootScope, $compile) {
+      $animate.pin(element, $rootElement);
 
-        var html = '<section ng-animate-children="false">' +
-                   '  <aside class="parent" ng-if="on" ng-animate-children="true">' +
-                   '    <div class="child" ng-if="on">...</div>' +
-                   '  </aside>' +
-                   '</section>';
+      $animate.addClass(element, 'blue');
+      $rootScope.$digest();
+      expect(capturedAnimation).toBeTruthy();
 
-        var element = $compile(html)($rootScope);
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+      dealoc(element);
+    }));
 
-        $rootScope.$digest();
+    it('should adhere to the disabled state of the hosted parent when an element is pinned',
+      inject(function($animate, $compile, $$body, $rootElement, $rootScope) {
 
-        $rootScope.on = true;
-        $rootScope.$digest();
+      var innerParent = jqLite('<div></div>');
+      $$body.append(innerParent);
+      innerParent.append($rootElement);
+      var innerChild = jqLite('<div></div>');
+      $rootElement.append(innerChild);
 
-        $animate.triggerReflow();
+      var element = jqLite('<div></div>');
+      $$body.append(element);
 
-        expect(spy).toHaveBeenCalled();
-        expect(spy.callCount).toBe(1);
-      }));
+      $animate.pin(element, innerChild);
 
-      it('should permit class-based animations when ng-animate-children is true for a structural animation', function() {
-          var spy = jasmine.createSpy();
-
-          module(function($animateProvider) {
-            $animateProvider.register('.inner', function() {
-              return {
-                beforeAddClass: function(element, className, done) {
-                  spy();
-                  done();
-                },
-                beforeRemoveClass: function(element, className, done) {
-                  spy();
-                  done();
-                }
-              };
-            });
-          });
+      $animate.enabled(innerChild, false);
 
-          inject(function($animate, $sniffer, $rootScope, $compile) {
+      $animate.addClass(element, 'blue');
+      $rootScope.$digest();
+      expect(capturedAnimation).toBeFalsy();
 
-          $animate.enabled(true);
+      $animate.enabled(innerChild, true);
 
-          var html = '<div ng-animate-children>' +
-                     '  <div class="inner" ng-class="{animate:bool}">...</div>' +
-                     '</div>';
+      $animate.addClass(element, 'red');
+      $rootScope.$digest();
+      expect(capturedAnimation).toBeTruthy();
 
-          var element = angular.element(html);
-          $compile(element)($rootScope);
-          var body = angular.element($document[0].body);
-          body.append($rootElement);
+      dealoc(element);
+    }));
+  });
 
-          $rootScope.$watch('bool', function(bool) {
-            if (bool) {
-              $animate.enter(element, $rootElement);
-            } else if (element.parent().length) {
-              $animate.leave(element);
-            }
-          });
+  describe('callbacks', function() {
+    var captureLog = [];
+    var capturedAnimation = [];
+    var runner;
+    var body;
+    beforeEach(module(function($provide) {
+      runner = null;
+      capturedAnimation = null;
+      $provide.factory('$$animation', function($$AnimateRunner) {
+        return function() {
+          captureLog.push(capturedAnimation = arguments);
+          return runner = new $$AnimateRunner();
+        };
+      });
 
-          $rootScope.$digest();
-          expect(spy.callCount).toBe(0);
+      return function($$body, $rootElement, $animate) {
+        $$body.append($rootElement);
+        $animate.enabled(true);
+      };
+    }));
 
-          $rootScope.bool = true;
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          $animate.triggerCallbacks();
-          expect(spy.callCount).toBe(1);
+    it('should trigger a callback for an enter animation',
+      inject(function($animate, $rootScope, $$rAF, $rootElement, $$body) {
 
-          $rootScope.bool = false;
-          $rootScope.$digest();
-          $animate.triggerReflow();
-          $animate.triggerCallbacks();
-          expect(spy.callCount).toBe(2);
-        });
+      var callbackTriggered = false;
+      $animate.on('enter', $$body, function() {
+        callbackTriggered = true;
       });
-    });
 
-    describe('SVG', function() {
-      it('should properly apply transitions on an SVG element',
-        inject(function($animate, $rootScope, $compile, $rootElement, $sniffer) {
+      element = jqLite('<div></div>');
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
 
-        //jQuery doesn't handle SVG elements natively. Instead, an add-on library
-        //is required which is called jquery.svg.js. Therefore, when jQuery is
-        //active here there is no point to test this since it won't work by default.
-        if (!$sniffer.transitions) return;
+      $$rAF.flush();
 
-        ss.addRule('circle.ng-enter', '-webkit-transition:1s linear all;' +
-                                              'transition:1s linear all;');
+      expect(callbackTriggered).toBe(true);
+    }));
 
-        var element = $compile('<svg width="500" height="500">' +
-                                 '<circle cx="15" cy="5" r="100" fill="orange" ng-if="on" />' +
-                               '</svg>')($rootScope);
+    it('should fire the callback with the signature of (element, phase, data)',
+      inject(function($animate, $rootScope, $$rAF, $rootElement, $$body) {
 
-        $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+      var capturedElement;
+      var capturedPhase;
+      var capturedData;
+      $animate.on('enter', $$body,
+        function(element, phase, data) {
 
-        $rootScope.$digest();
+        capturedElement = element;
+        capturedPhase = phase;
+        capturedData = data;
+      });
 
-        $rootScope.on = true;
-        $rootScope.$digest();
-        $animate.triggerReflow();
+      element = jqLite('<div></div>');
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
-        var child = element.find('circle');
+      expect(capturedElement).toBe(element);
+      expect(isString(capturedPhase)).toBe(true);
+      expect(isObject(capturedData)).toBe(true);
+    }));
 
-        expect(jqLiteHasClass(child[0], 'ng-enter')).toBe(true);
-        expect(jqLiteHasClass(child[0], 'ng-enter-active')).toBe(true);
+    it('should not fire a callback if the element is outside of the given container',
+      inject(function($animate, $rootScope, $$rAF, $rootElement) {
 
-        browserTrigger(child, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
+      var callbackTriggered = false;
+      var innerContainer = jqLite('<div></div>');
+      $rootElement.append(innerContainer);
 
-        expect(jqLiteHasClass(child[0], 'ng-enter')).toBe(false);
-        expect(jqLiteHasClass(child[0], 'ng-enter-active')).toBe(false);
-      }));
+      $animate.on('enter', innerContainer,
+        function(element, phase, data) {
 
+        callbackTriggered = true;
+      });
 
-      it('should properly remove classes from SVG elements', inject(function($animate, $rootScope) {
-        var element = jqLite('<svg width="500" height="500"><rect class="class-of-doom"></rect></svg>');
-        var child = element.find('rect');
-        $animate.removeClass(child, 'class-of-doom');
+      element = jqLite('<div></div>');
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
-        $rootScope.$digest();
-        expect(child.attr('class')).toBe('');
+      expect(callbackTriggered).toBe(false);
+    }));
 
-        dealoc(element);
-      }));
-    });
-  });
+    it('should fire a callback if the element is the given container',
+      inject(function($animate, $rootScope, $$rAF, $rootElement) {
 
+      element = jqLite('<div></div>');
 
-  describe('CSS class DOM manipulation', function() {
-    var element;
-    var addClass;
-    var removeClass;
+      var callbackTriggered = false;
+      $animate.on('enter', element,
+        function(element, phase, data) {
 
-    beforeEach(module(provideLog));
+        callbackTriggered = true;
+      });
 
-    afterEach(function() {
-      dealoc(element);
-    });
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
-    function setupClassManipulationSpies() {
-      inject(function($animate) {
-        addClass = spyOn($originalAnimate, '$$addClassImmediately').andCallThrough();
-        removeClass = spyOn($originalAnimate, '$$removeClassImmediately').andCallThrough();
-      });
-    }
-
-    function setupClassManipulationLogger(log) {
-      inject(function($animate) {
-        var addClassImmediately = $originalAnimate.$$addClassImmediately;
-        var removeClassImmediately = $originalAnimate.$$removeClassImmediately;
-        addClass = spyOn($originalAnimate, '$$addClassImmediately').andCallFake(function(element, classes) {
-          var names = classes;
-          if (Object.prototype.toString.call(classes) === '[object Array]') names = classes.join(' ');
-          log('addClass(' + names + ')');
-          return addClassImmediately.call($originalAnimate, element, classes);
-        });
-        removeClass = spyOn($originalAnimate, '$$removeClassImmediately').andCallFake(function(element, classes) {
-          var names = classes;
-          if (Object.prototype.toString.call(classes) === '[object Array]') names = classes.join(' ');
-          log('removeClass(' + names + ')');
-          return removeClassImmediately.call($originalAnimate, element, classes);
-        });
-      });
-    }
+      expect(callbackTriggered).toBe(true);
+    }));
+
+    it('should remove all the event-based event listeners when $animate.off(event) is called',
+      inject(function($animate, $rootScope, $$rAF, $rootElement, $$body) {
 
+      element = jqLite('<div></div>');
+
+      var count = 0;
+      $animate.on('enter', element, counter);
+      $animate.on('enter', $$body, counter);
 
-    it('should defer class manipulation until end of digest', inject(function($rootScope, $animate, log) {
-      setupClassManipulationLogger(log);
-      element = jqLite('<p>test</p>');
+      function counter(element, phase) {
+        count++;
+      }
 
-      $rootScope.$apply(function() {
-        $animate.addClass(element, 'test-class1');
-        expect(element).not.toHaveClass('test-class1');
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
-        $animate.removeClass(element, 'test-class1');
+      expect(count).toBe(2);
 
-        $animate.addClass(element, 'test-class2');
-        expect(element).not.toHaveClass('test-class2');
+      $animate.off('enter');
 
-        $animate.setClass(element, 'test-class3', 'test-class4');
-        expect(element).not.toHaveClass('test-class3');
-        expect(element).not.toHaveClass('test-class4');
-        expect(log).toEqual([]);
-      });
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
-      expect(element).not.toHaveClass('test-class1');
-      expect(element).not.toHaveClass('test-class4');
-      expect(element).toHaveClass('test-class2');
-      expect(element).toHaveClass('test-class3');
-      expect(log).toEqual(['addClass(test-class2 test-class3)']);
-      expect(addClass.callCount).toBe(1);
-      expect(removeClass.callCount).toBe(0);
+      expect(count).toBe(2);
     }));
 
+    it('should remove the container-based event listeners when $animate.off(event, container) is called',
+      inject(function($animate, $rootScope, $$rAF, $rootElement, $$body) {
 
-    it('should defer class manipulation until postDigest when outside of digest', inject(function($rootScope, $animate, log) {
-      setupClassManipulationLogger(log);
-      element = jqLite('<p class="test-class4">test</p>');
+      element = jqLite('<div></div>');
 
-      $animate.addClass(element, 'test-class1');
-      $animate.removeClass(element, 'test-class1');
-      $animate.addClass(element, 'test-class2');
-      $animate.setClass(element, 'test-class3', 'test-class4');
+      var count = 0;
+      $animate.on('enter', element, counter);
+      $animate.on('enter', $$body, counter);
 
-      expect(log).toEqual([]);
-      $rootScope.$digest();
+      function counter(element, phase) {
+        if (phase === 'start') {
+          count++;
+        }
+      }
 
-      expect(log).toEqual(['addClass(test-class2 test-class3)', 'removeClass(test-class4)']);
-      expect(element).not.toHaveClass('test-class1');
-      expect(element).toHaveClass('test-class2');
-      expect(element).toHaveClass('test-class3');
-      expect(addClass.callCount).toBe(1);
-      expect(removeClass.callCount).toBe(1);
-    }));
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
+      expect(count).toBe(2);
 
-    it('should perform class manipulation in expected order at end of digest', inject(function($rootScope, $animate, log) {
-      element = jqLite('<p class="test-class3">test</p>');
+      $animate.off('enter', $$body);
 
-      setupClassManipulationLogger(log);
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
-      $rootScope.$apply(function() {
-        $animate.addClass(element, 'test-class1');
-        $animate.addClass(element, 'test-class2');
-        $animate.removeClass(element, 'test-class1');
-        $animate.removeClass(element, 'test-class3');
-        $animate.addClass(element, 'test-class3');
-      });
-      expect(log).toEqual(['addClass(test-class2)']);
+      expect(count).toBe(3);
     }));
 
+    it('should remove the callback-based event listener when $animate.off(event, container, callback) is called',
+      inject(function($animate, $rootScope, $$rAF, $rootElement) {
 
-    it('should return a promise which is resolved on a different turn', inject(function(log, $animate, $browser, $rootScope) {
-      element = jqLite('<p class="test2">test</p>');
+      element = jqLite('<div></div>');
 
-      $animate.addClass(element, 'test1').then(log.fn('addClass(test1)'));
-      $animate.removeClass(element, 'test2').then(log.fn('removeClass(test2)'));
+      var count = 0;
+      $animate.on('enter', element, counter1);
+      $animate.on('enter', element, counter2);
 
-      $rootScope.$digest();
-      expect(log).toEqual([]);
-      $browser.defer.flush();
-      expect(log).toEqual(['addClass(test1)', 'removeClass(test2)']);
+      function counter1(element, phase) {
+        if (phase === 'start') {
+          count++;
+        }
+      }
 
-      log.reset();
-      element = jqLite('<p class="test4">test</p>');
+      function counter2(element, phase) {
+        if (phase === 'start') {
+          count++;
+        }
+      }
 
-      $rootScope.$apply(function() {
-        $animate.addClass(element, 'test3').then(log.fn('addClass(test3)'));
-        $animate.removeClass(element, 'test4').then(log.fn('removeClass(test4)'));
-        expect(log).toEqual([]);
-      });
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
-      $browser.defer.flush();
-      expect(log).toEqual(['addClass(test3)', 'removeClass(test4)']);
-    }));
+      expect(count).toBe(2);
 
+      $animate.off('enter', element, counter2);
 
-    it('should defer class manipulation until end of digest for SVG', inject(function($rootScope, $animate) {
-      if (!window.SVGElement) return;
-      setupClassManipulationSpies();
-      element = jqLite('<svg><g></g></svg>');
-      var target = element.children().eq(0);
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
 
-      $rootScope.$apply(function() {
-        $animate.addClass(target, 'test-class1');
-        expect(target).not.toHaveClass('test-class1');
+      expect(count).toBe(3);
+    }));
 
-        $animate.removeClass(target, 'test-class1');
+    it('should fire a `start` callback when the animation starts with the matching element',
+      inject(function($animate, $rootScope, $$rAF, $rootElement, $$body) {
 
-        $animate.addClass(target, 'test-class2');
-        expect(target).not.toHaveClass('test-class2');
+      element = jqLite('<div></div>');
 
-        $animate.setClass(target, 'test-class3', 'test-class4');
-        expect(target).not.toHaveClass('test-class3');
-        expect(target).not.toHaveClass('test-class4');
+      var capturedState;
+      var capturedElement;
+      $animate.on('enter', $$body, function(element, phase) {
+        capturedState = phase;
+        capturedElement = element;
       });
 
-      expect(target).not.toHaveClass('test-class1');
-      expect(target).toHaveClass('test-class2');
-      expect(addClass.callCount).toBe(1);
-      expect(removeClass.callCount).toBe(0);
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
+
+      expect(capturedState).toBe('start');
+      expect(capturedElement).toBe(element);
     }));
 
+    it('should fire a `close` callback when the animation ends with the matching element',
+      inject(function($animate, $rootScope, $$rAF, $rootElement, $$body) {
 
-    it('should defer class manipulation until postDigest when outside of digest for SVG', inject(function($rootScope, $animate, log) {
-      if (!window.SVGElement) return;
-      setupClassManipulationLogger(log);
-      element = jqLite('<svg><g class="test-class4"></g></svg>');
-      var target = element.children().eq(0);
+      element = jqLite('<div></div>');
 
-      $animate.addClass(target, 'test-class1');
-      $animate.removeClass(target, 'test-class1');
-      $animate.addClass(target, 'test-class2');
-      $animate.setClass(target, 'test-class3', 'test-class4');
+      var capturedState;
+      var capturedElement;
+      $animate.on('enter', $$body, function(element, phase) {
+        capturedState = phase;
+        capturedElement = element;
+      });
 
-      expect(log).toEqual([]);
+      var runner = $animate.enter(element, $rootElement);
       $rootScope.$digest();
+      runner.end();
+      $$rAF.flush();
 
-      expect(log).toEqual(['addClass(test-class2 test-class3)', 'removeClass(test-class4)']);
-      expect(target).not.toHaveClass('test-class1');
-      expect(target).toHaveClass('test-class2');
-      expect(target).toHaveClass('test-class3');
-      expect(addClass.callCount).toBe(1);
-      expect(removeClass.callCount).toBe(1);
+      expect(capturedState).toBe('close');
+      expect(capturedElement).toBe(element);
     }));
 
+    it('should remove the event listener if the element is removed',
+      inject(function($animate, $rootScope, $$rAF, $rootElement) {
 
-    it('should perform class manipulation in expected order at end of digest for SVG', inject(function($rootScope, $animate, log) {
-      if (!window.SVGElement) return;
-      element = jqLite('<svg><g class="test-class3"></g></svg>');
-      var target = element.children().eq(0);
+      element = jqLite('<div></div>');
 
-      setupClassManipulationLogger(log);
+      var count = 0;
+      $animate.on('enter', element, counter);
+      $animate.on('addClass', element, counter);
 
-      $rootScope.$apply(function() {
-        $animate.addClass(target, 'test-class1');
-        $animate.addClass(target, 'test-class2');
-        $animate.removeClass(target, 'test-class1');
-        $animate.removeClass(target, 'test-class3');
-        $animate.addClass(target, 'test-class3');
-      });
-      expect(log).toEqual(['addClass(test-class2)']);
+      function counter(element, phase) {
+        if (phase === 'start') {
+          count++;
+        }
+      }
+
+      $animate.enter(element, $rootElement);
+      $rootScope.$digest();
+      $$rAF.flush();
+
+      expect(count).toBe(1);
+      element.remove();
+
+      $animate.addClass(element, 'viljami');
+      $rootScope.$digest();
+      $$rAF.flush();
+      expect(count).toBe(1);
     }));
+
   });
 });
diff --git a/test/ngAnimate/animationHelperFunctionsSpec.js b/test/ngAnimate/animationHelperFunctionsSpec.js
new file mode 100644
index 000000000000..eb66e6205555
--- /dev/null
+++ b/test/ngAnimate/animationHelperFunctionsSpec.js
@@ -0,0 +1,135 @@
+'use strict';
+
+describe("animation option helper functions", function() {
+
+  beforeEach(module('ngAnimate'));
+
+  var element, applyAnimationClasses;
+  beforeEach(inject(function($$jqLite) {
+    applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+    element = jqLite('<div></div>');
+  }));
+
+  describe('prepareAnimationOptions', function() {
+    it('should construct an options wrapper from the provided options',
+      inject(function() {
+
+      var options = prepareAnimationOptions({
+        value: 'hello'
+      });
+
+      expect(options.value).toBe('hello');
+    }));
+
+    it('should return the same instance it already instantiated as an options object with the given element',
+      inject(function() {
+
+      var options = prepareAnimationOptions({});
+      expect(prepareAnimationOptions(options)).toBe(options);
+
+      var options2 = {};
+      expect(prepareAnimationOptions(options2)).not.toBe(options);
+    }));
+  });
+
+  describe('applyAnimationStyles', function() {
+    it('should apply the provided `from` styles', inject(function() {
+      var options = prepareAnimationOptions({
+        from: { color: 'maroon' },
+        to: { color: 'blue' }
+      });
+
+      applyAnimationFromStyles(element, options);
+      expect(element.attr('style')).toContain('maroon');
+    }));
+
+    it('should apply the provided `to` styles', inject(function() {
+      var options = prepareAnimationOptions({
+        from: { color: 'red' },
+        to: { color: 'black' }
+      });
+
+      applyAnimationToStyles(element, options);
+      expect(element.attr('style')).toContain('black');
+    }));
+
+    it('should apply the both provided `from` and `to` styles', inject(function() {
+      var options = prepareAnimationOptions({
+        from: { color: 'red', 'font-size':'50px' },
+        to: { color: 'green' }
+      });
+
+      applyAnimationStyles(element, options);
+      expect(element.attr('style')).toContain('green');
+      expect(element.css('font-size')).toBe('50px');
+    }));
+
+    it('should only apply the options once', inject(function() {
+      var options = prepareAnimationOptions({
+        from: { color: 'red', 'font-size':'50px' },
+        to: { color: 'blue' }
+      });
+
+      applyAnimationStyles(element, options);
+      expect(element.attr('style')).toContain('blue');
+
+      element.attr('style', '');
+
+      applyAnimationStyles(element, options);
+      expect(element.attr('style') || '').toBe('');
+    }));
+  });
+
+  describe('applyAnimationClasses', function() {
+    it('should add/remove the provided CSS classes', inject(function() {
+      element.addClass('four six');
+      var options = prepareAnimationOptions({
+        addClass: 'one two three',
+        removeClass: 'four'
+      });
+
+      applyAnimationClasses(element, options);
+      expect(element).toHaveClass('one two three');
+      expect(element).toHaveClass('six');
+      expect(element).not.toHaveClass('four');
+    }));
+
+    it('should add/remove the provided CSS classes only once', inject(function() {
+      element.attr('class', 'blue');
+      var options = prepareAnimationOptions({
+        addClass: 'black',
+        removeClass: 'blue'
+      });
+
+      applyAnimationClasses(element, options);
+      element.attr('class', 'blue');
+
+      applyAnimationClasses(element, options);
+      expect(element).toHaveClass('blue');
+      expect(element).not.toHaveClass('black');
+    }));
+  });
+
+  describe('mergeAnimationOptions', function() {
+    it('should merge in new options', inject(function() {
+      element.attr('class', 'blue');
+      var options = prepareAnimationOptions({
+        name: 'matias',
+        age: 28,
+        addClass: 'black',
+        removeClass: 'blue gold'
+      });
+
+      mergeAnimationOptions(element, options, {
+        age: 29,
+        addClass: 'gold brown',
+        removeClass: 'orange'
+      });
+
+      expect(options.name).toBe('matias');
+      expect(options.age).toBe(29);
+      expect(options.addClass).toBe('black brown');
+      expect(options.removeClass).toBe('blue');
+    }));
+  });
+});
diff --git a/test/ngAnimate/animationSpec.js b/test/ngAnimate/animationSpec.js
new file mode 100644
index 000000000000..4eab910a1cbb
--- /dev/null
+++ b/test/ngAnimate/animationSpec.js
@@ -0,0 +1,951 @@
+'use strict';
+
+describe('$$animation', function() {
+
+  beforeEach(module('ngAnimate'));
+
+  var element;
+  afterEach(function() {
+    dealoc(element);
+  });
+
+  beforeEach(module(function($$animationProvider) {
+    $$animationProvider.drivers.length = 0;
+  }));
+
+  it("should not run an animation if there are no drivers",
+    inject(function($$animation, $$rAF, $rootScope) {
+
+    element = jqLite('<div></div>');
+    var done = false;
+    $$animation(element, 'someEvent').then(function() {
+      done = true;
+    });
+    $$rAF.flush();
+    $rootScope.$digest();
+    expect(done).toBe(true);
+  }));
+
+  it("should not run an animation if no drivers return an animation step function", function() {
+    module(function($$animationProvider, $provide) {
+      $$animationProvider.drivers.push('matiasDriver');
+      $provide.value('matiasDriver', function() {
+        return false;
+      });
+    });
+    inject(function($$animation, $$rAF, $rootScope) {
+      element = jqLite('<div></div>');
+      var done = false;
+      $$animation(element, 'someEvent').then(function() {
+        done = true;
+      });
+      $rootScope.$digest();
+      $$rAF.flush();
+      $rootScope.$digest();
+      expect(done).toBe(true);
+    });
+  });
+
+  describe("drivers", function() {
+    it("should use the first driver that returns a step function", function() {
+      var count = 0;
+      var activeDriver;
+      module(function($$animationProvider, $provide) {
+        $$animationProvider.drivers.push('1');
+        $$animationProvider.drivers.push('2');
+        $$animationProvider.drivers.push('3');
+
+        var runner;
+
+        $provide.value('1', function() {
+          count++;
+        });
+
+        $provide.value('2', function() {
+          count++;
+          return {
+            start: function() {
+              activeDriver = '2';
+              return runner;
+            }
+          };
+        });
+
+        $provide.value('3', function() {
+          count++;
+        });
+
+        return function($$AnimateRunner) {
+          runner = new $$AnimateRunner();
+        };
+      });
+
+      inject(function($$animation, $rootScope, $rootElement) {
+        element = jqLite('<div></div>');
+        $rootElement.append(element);
+
+        $$animation(element, 'enter');
+        $rootScope.$digest();
+
+        expect(count).toBe(2);
+        expect(activeDriver).toBe('2');
+      });
+    });
+
+    describe('step function', function() {
+      var capturedAnimation;
+      beforeEach(module(function($$animationProvider, $provide) {
+        element = jqLite('<div></div>');
+
+        $$animationProvider.drivers.push('stepper');
+        $provide.factory('stepper', function($$AnimateRunner) {
+          return function() {
+            capturedAnimation = arguments;
+            return {
+              start: function() {
+                return new $$AnimateRunner();
+              }
+            };
+          };
+        });
+      }));
+
+      it("should obtain the element, event, the provided options and the domOperation",
+        inject(function($$animation, $rootScope, $rootElement) {
+        $rootElement.append(element);
+
+        var options = {};
+        options.foo = 'bar';
+        options.domOperation = function() {
+          domOperationCalled = true;
+        };
+        var domOperationCalled = false;
+        $$animation(element, 'megaEvent', options);
+        $rootScope.$digest();
+
+        var details = capturedAnimation[0];
+        expect(details.element).toBe(element);
+        expect(details.event).toBe('megaEvent');
+        expect(details.options.foo).toBe(options.foo);
+
+        // the function is wrapped inside of $$animation, but it is still a function
+        expect(domOperationCalled).toBe(false);
+        details.options.domOperation();
+        expect(domOperationCalled).toBe(true);
+      }));
+
+      it("should obtain the classes string which is a combination of className, addClass and removeClass",
+        inject(function($$animation, $rootScope, $rootElement) {
+
+        element.addClass('blue red');
+        $rootElement.append(element);
+
+        $$animation(element, 'enter', {
+          addClass: 'green',
+          removeClass: 'orange',
+          tempClasses: 'pink'
+        });
+
+        $rootScope.$digest();
+
+        var classes = capturedAnimation[0].classes;
+        expect(classes).toBe('blue red green orange pink');
+      }));
+    });
+
+    it("should traverse the drivers in reverse order", function() {
+      var log = [];
+      module(function($$animationProvider, $provide) {
+        $$animationProvider.drivers.push('first');
+        $$animationProvider.drivers.push('second');
+
+        $provide.value('first', function() {
+          log.push('first');
+          return false;
+        });
+
+        $provide.value('second', function() {
+          log.push('second');
+          return false;
+        });
+      });
+
+      inject(function($$animation, $rootScope, $rootElement) {
+        element = jqLite('<div></div>');
+        $rootElement.append(element);
+        $$animation(element, 'enter');
+        $rootScope.$digest();
+        expect(log).toEqual(['second', 'first']);
+      });
+    });
+
+    they("should $prop the animation call if the driver $proped the returned promise",
+      ['resolve', 'reject'], function(event) {
+
+      module(function($$animationProvider, $provide) {
+        $$animationProvider.drivers.push('resolvingAnimation');
+        $provide.factory('resolvingAnimation', function($$AnimateRunner) {
+          return function() {
+            return {
+              start: function() {
+                return new $$AnimateRunner();
+              }
+            };
+          };
+        });
+      });
+
+      inject(function($$animation, $rootScope, $$rAF) {
+        var status, element = jqLite('<div></div>');
+        var runner = $$animation(element, 'enter');
+        runner.then(function() {
+            status = 'resolve';
+          }, function() {
+            status = 'reject';
+          });
+
+        // the animation is started
+        $rootScope.$digest();
+
+        event === 'resolve' ? runner.end() : runner.cancel();
+
+        // the resolve/rejection digest
+        $$rAF.flush();
+        $rootScope.$digest();
+
+        expect(status).toBe(event);
+      });
+    });
+
+    they("should $prop the driver animation when runner.$prop() is called",
+      ['cancel', 'end'], function(method) {
+
+      var log = [];
+
+      module(function($$animationProvider, $provide) {
+        $$animationProvider.drivers.push('actualDriver');
+        $provide.factory('actualDriver', function($$AnimateRunner) {
+          return function() {
+            return {
+              start: function() {
+                log.push('start');
+                return new $$AnimateRunner({
+                  end: function() {
+                    log.push('end');
+                  },
+                  cancel: function() {
+                    log.push('cancel');
+                  }
+                });
+              }
+            };
+          };
+        });
+      });
+
+      inject(function($$animation, $rootScope, $rootElement) {
+        element = jqLite('<div></div>');
+        $rootElement.append(element);
+
+        var runner = $$animation(element, 'enter');
+        $rootScope.$digest();
+
+        runner[method]();
+        expect(log).toEqual(['start', method]);
+      });
+    });
+  });
+
+  describe('when', function() {
+    var captureLog;
+    var runnerLog;
+    var capturedAnimation;
+
+    beforeEach(module(function($$animationProvider, $provide) {
+      captureLog = [];
+      runnerLog = [];
+      capturedAnimation = null;
+
+      $$animationProvider.drivers.push('interceptorDriver');
+      $provide.factory('interceptorDriver', function($$AnimateRunner) {
+        return function(details) {
+          captureLog.push(capturedAnimation = details); //only one param is passed into the driver
+          return {
+            start: function() {
+              return new $$AnimateRunner({
+                end: runnerEvent('end'),
+                cancel: runnerEvent('cancel')
+              });
+            }
+          };
+        };
+      });
+
+      function runnerEvent(token) {
+        return function() {
+          runnerLog.push(token);
+        };
+      }
+    }));
+
+    describe("singular", function() {
+      beforeEach(module(function($provide) {
+        element = jqLite('<div></div>');
+        return function($rootElement) {
+          $rootElement.append(element);
+        };
+      }));
+
+      they('should return a runner that object that contains a $prop() function',
+        ['end', 'cancel', 'then'], function(method) {
+        inject(function($$animation) {
+          var runner = $$animation(element, 'someEvent');
+          expect(isFunction(runner[method])).toBe(true);
+        });
+      });
+
+      they('should close the animation if runner.$prop() is called before the $postDigest phase kicks in',
+        ['end', 'cancel'], function(method) {
+        inject(function($$animation, $rootScope, $$rAF) {
+          var status;
+          var runner = $$animation(element, 'someEvent');
+          runner.then(function() { status = 'end'; },
+                      function() { status = 'cancel'; });
+
+          runner[method]();
+          $rootScope.$digest();
+          expect(runnerLog).toEqual([]);
+
+          $$rAF.flush();
+          expect(status).toBe(method);
+        });
+      });
+
+      they('should update the runner methods to the ones provided by the driver when the animation starts',
+        ['end', 'cancel'], function(method) {
+
+        var spy = jasmine.createSpy();
+        module(function($$animationProvider, $provide) {
+          $$animationProvider.drivers.push('animalDriver');
+          $provide.factory('animalDriver', function($$AnimateRunner) {
+            return function() {
+              return {
+                start: function() {
+                  var data = {};
+                  data[method] = spy;
+                  return new $$AnimateRunner(data);
+                }
+              };
+            };
+          });
+        });
+        inject(function($$animation, $rootScope, $rootElement) {
+          var r1 = $$animation(element, 'someEvent');
+          r1[method]();
+          expect(spy).not.toHaveBeenCalled();
+          $rootScope.$digest(); // this clears the digest which cleans up the mess
+
+          var r2 = $$animation(element, 'otherEvent');
+          $rootScope.$digest();
+          r2[method]();
+          expect(spy).toHaveBeenCalled();
+        });
+      });
+
+      it('should not start the animation if the element is removed from the DOM before the postDigest kicks in',
+        inject(function($$animation) {
+
+        var runner = $$animation(element, 'someEvent');
+
+        expect(capturedAnimation).toBeFalsy();
+        element.remove();
+        expect(capturedAnimation).toBeFalsy();
+      }));
+
+      it('should immediately end the animation if the element is removed from the DOM during the animation',
+        inject(function($$animation, $$rAF, $rootScope) {
+
+        var runner = $$animation(element, 'someEvent');
+        $rootScope.$digest();
+        $$rAF.flush(); //the animation is "animating"
+
+        expect(capturedAnimation).toBeTruthy();
+        expect(runnerLog).toEqual([]);
+        element.remove();
+        expect(runnerLog).toEqual(['end']);
+      }));
+
+      it('should not end the animation when the leave animation removes the element from the DOM',
+        inject(function($$animation, $$rAF, $rootScope) {
+
+        var runner = $$animation(element, 'leave', {}, function() {
+          element.remove();
+        });
+
+        $rootScope.$digest();
+        $$rAF.flush(); //the animation is "animating"
+
+        expect(runnerLog).toEqual([]);
+        capturedAnimation.options.domOperation(); //this removes the element
+        element.remove();
+        expect(runnerLog).toEqual([]);
+      }));
+
+      it('should remove the $destroy event listener when the animation is closed',
+        inject(function($$animation, $$rAF, $rootScope) {
+
+        var addListen = spyOn(element, 'on').andCallThrough();
+        var removeListen = spyOn(element, 'off').andCallThrough();
+        var runner = $$animation(element, 'someEvent');
+
+        var args = addListen.mostRecentCall.args[0];
+        expect(args).toBe('$destroy');
+
+        runner.end();
+
+        args = removeListen.mostRecentCall.args[0];
+        expect(args).toBe('$destroy');
+      }));
+
+      it('should always sort parent-element animations to run in order of parent-to-child DOM structure',
+        inject(function($$animation, $$rAF, $rootScope) {
+
+        var child = jqLite('<div></div>');
+        var grandchild = jqLite('<div></div>');
+
+        element.append(child);
+        child.append(grandchild);
+
+        $$animation(grandchild, 'enter');
+        $$animation(child, 'enter');
+        $$animation(element, 'enter');
+
+        expect(captureLog.length).toBe(0);
+
+        $rootScope.$digest();
+
+        expect(captureLog[0].element).toBe(element);
+        expect(captureLog[1].element).toBe(child);
+        expect(captureLog[2].element).toBe(grandchild);
+      }));
+    });
+
+    describe("grouped", function() {
+      var fromElement;
+      var toElement;
+      var fromAnchors;
+      var toAnchors;
+      beforeEach(module(function($provide) {
+        fromElement = jqLite('<div></div>');
+        toElement = jqLite('<div></div>');
+        fromAnchors = [
+          jqLite('<div>1</div>'),
+          jqLite('<div>2</div>'),
+          jqLite('<div>3</div>')
+        ];
+        toAnchors = [
+          jqLite('<div>a</div>'),
+          jqLite('<div>b</div>'),
+          jqLite('<div>c</div>')
+        ];
+
+        return function($rootElement) {
+          $rootElement.append(fromElement);
+          $rootElement.append(toElement);
+          forEach(fromAnchors, function(a) {
+            fromElement.append(a);
+          });
+          forEach(toAnchors, function(a) {
+            toElement.append(a);
+          });
+        };
+      }));
+
+      it("should group animations together when they have shared anchors and a shared CSS class",
+        inject(function($$animation, $rootScope) {
+
+        fromElement.addClass('shared-class');
+        $$animation(fromElement, 'leave');
+
+        toElement.addClass('shared-class');
+        $$animation(toElement, 'enter');
+
+        fromAnchors[0].attr('ng-animate-ref', '1');
+        toAnchors[0].attr('ng-animate-ref', '1');
+        $rootScope.$digest();
+
+        expect(captureLog.length).toBe(1);
+
+        var fromAnimation = capturedAnimation.from;
+        expect(fromAnimation.element).toEqual(fromElement);
+        expect(fromAnimation.event).toBe('leave');
+
+        var toAnimation = capturedAnimation.to;
+        expect(toAnimation.element).toBe(toElement);
+        expect(toAnimation.event).toBe('enter');
+
+        var fromElm = fromAnchors[0];
+        var toElm = toAnchors[0];
+
+        var anchors = capturedAnimation.anchors[0];
+        assertCompareNodes(fromElm, anchors['out']);
+        assertCompareNodes(toElm, anchors['in']);
+      }));
+
+      it("should group animations together and properly match up multiple anchors based on their references",
+        inject(function($$animation, $rootScope) {
+
+        var attr = 'ng-animate-ref';
+
+        fromAnchors[0].attr(attr, '1');
+        fromAnchors[1].attr(attr, '2');
+        fromAnchors[2].attr(attr, '3');
+
+        toAnchors[0].attr(attr, '1');
+        toAnchors[1].attr(attr, '3');
+        toAnchors[2].attr(attr, '2');
+
+        fromElement.addClass('shared-class');
+        $$animation(fromElement, 'leave');
+
+        toElement.addClass('shared-class');
+        $$animation(toElement, 'enter');
+
+        $rootScope.$digest();
+
+        var anchors = capturedAnimation.anchors;
+        assertCompareNodes(fromAnchors[0], anchors[0]['out']);
+        assertCompareNodes(toAnchors[0], anchors[0]['in']);
+
+        assertCompareNodes(fromAnchors[1], anchors[1]['out']);
+        assertCompareNodes(toAnchors[2], anchors[1]['in']);
+
+        assertCompareNodes(fromAnchors[2], anchors[2]['out']);
+        assertCompareNodes(toAnchors[1], anchors[2]['in']);
+      }));
+
+      it("should group animations together on the from and to elements if their both contain matching anchors",
+        inject(function($$animation, $rootScope) {
+
+        fromElement.addClass('shared-class');
+        fromElement.attr('ng-animate-ref', '1');
+        $$animation(fromElement, 'leave');
+
+        toElement.addClass('shared-class');
+        toElement.attr('ng-animate-ref', '1');
+        $$animation(toElement, 'enter');
+
+        $rootScope.$digest();
+
+        var anchors = capturedAnimation.anchors[0];
+        assertCompareNodes(fromElement, anchors['out']);
+        assertCompareNodes(toElement, anchors['in']);
+      }));
+
+      it("should not group animations into an anchored animation if enter/leave events are NOT used",
+        inject(function($$animation, $rootScope) {
+
+        fromElement.addClass('shared-class');
+        fromElement.attr('ng-animate-ref', '1');
+        $$animation(fromElement, 'addClass', {
+          addClass: 'red'
+        });
+
+        toElement.addClass('shared-class');
+        toElement.attr('ng-animate-ref', '1');
+        $$animation(toElement, 'removeClass', {
+          removeClass: 'blue'
+        });
+
+        $rootScope.$digest();
+        expect(captureLog.length).toBe(2);
+      }));
+
+      it("should not group animations together if a matching pair of anchors is not detected",
+        inject(function($$animation, $rootScope) {
+
+        fromElement.addClass('shared-class');
+        $$animation(fromElement, 'leave');
+
+        toElement.addClass('shared-class');
+        $$animation(toElement, 'enter');
+
+        fromAnchors[0].attr('ng-animate-ref', '6');
+        toAnchors[0].attr('ng-animate-ref', '3');
+        $rootScope.$digest();
+
+        expect(captureLog.length).toBe(2);
+      }));
+
+      it("should not group animations together if a matching CSS class is not detected",
+        inject(function($$animation, $rootScope) {
+
+        fromElement.addClass('even-class');
+        $$animation(fromElement, 'leave');
+
+        toElement.addClass('odd-class');
+        $$animation(toElement, 'enter');
+
+        fromAnchors[0].attr('ng-animate-ref', '9');
+        toAnchors[0].attr('ng-animate-ref', '9');
+        $rootScope.$digest();
+
+        expect(captureLog.length).toBe(2);
+      }));
+
+      it("should expose the shared CSS class in the options provided to the driver",
+        inject(function($$animation, $rootScope) {
+
+        fromElement.addClass('fresh-class');
+        $$animation(fromElement, 'leave');
+
+        toElement.addClass('fresh-class');
+        $$animation(toElement, 'enter');
+
+        fromAnchors[0].attr('ng-animate-ref', '9');
+        toAnchors[0].attr('ng-animate-ref', '9');
+        $rootScope.$digest();
+
+        expect(capturedAnimation.classes).toBe('fresh-class');
+      }));
+
+      it("should update the runner methods to the grouped runner methods handled by the driver",
+        inject(function($$animation, $rootScope) {
+
+        fromElement.addClass('group-1');
+        var runner1 = $$animation(fromElement, 'leave');
+
+        toElement.addClass('group-1');
+        var runner2 = $$animation(toElement, 'enter');
+
+        expect(runner1).not.toBe(runner2);
+
+        fromAnchors[0].attr('ng-animate-ref', 'abc');
+        toAnchors[0].attr('ng-animate-ref', 'abc');
+        $rootScope.$digest();
+
+        expect(runner1).not.toBe(runner2);
+        expect(runner1.end).toBe(runner2.end);
+        expect(runner1.cancel).toBe(runner2.cancel);
+      }));
+
+      they("should end the animation if the $prop element is prematurely removed from the DOM during the animation", ['from', 'to'], function(event) {
+        inject(function($$animation, $rootScope) {
+          fromElement.addClass('group-1');
+          $$animation(fromElement, 'leave');
+
+          toElement.addClass('group-1');
+          $$animation(toElement, 'enter');
+
+          fromAnchors[0].attr('ng-animate-ref', 'abc');
+          toAnchors[0].attr('ng-animate-ref', 'abc');
+          $rootScope.$digest();
+
+          expect(runnerLog).toEqual([]);
+
+          ('from' ? fromElement : toElement).remove();
+          expect(runnerLog).toEqual(['end']);
+        });
+      });
+
+      it("should not end the animation when the `from` animation calls its own leave dom operation",
+        inject(function($$animation, $rootScope, $$rAF) {
+
+        fromElement.addClass('group-1');
+        var elementRemoved = false;
+        $$animation(fromElement, 'leave', {
+          domOperation: function() {
+            elementRemoved = true;
+            fromElement.remove();
+          }
+        });
+
+        toElement.addClass('group-1');
+        $$animation(toElement, 'enter');
+
+        fromAnchors[0].attr('ng-animate-ref', 'abc');
+        toAnchors[0].attr('ng-animate-ref', 'abc');
+        $rootScope.$digest();
+
+        var leaveAnimation = capturedAnimation.from;
+        expect(leaveAnimation.event).toBe('leave');
+
+        // this removes the element and this code is run normally
+        // by the driver when it is time for the element to be removed
+        leaveAnimation.options.domOperation();
+
+        expect(elementRemoved).toBe(true);
+        expect(runnerLog).toEqual([]);
+      }));
+
+      it("should not end the animation if any of the anchor elements are removed from the DOM during the animation",
+        inject(function($$animation, $rootScope, $$rAF) {
+
+        fromElement.addClass('group-1');
+        var elementRemoved = false;
+        $$animation(fromElement, 'leave', {}, function() {
+          elementRemoved = true;
+          fromElement.remove();
+        });
+
+        toElement.addClass('group-1');
+        $$animation(toElement, 'enter');
+
+        fromAnchors[0].attr('ng-animate-ref', 'abc');
+        toAnchors[0].attr('ng-animate-ref', 'abc');
+        $rootScope.$digest();
+
+        fromAnchors[0].remove();
+        toAnchors[0].remove();
+
+        expect(runnerLog).toEqual([]);
+      }));
+
+      it('should prepare a parent-element animation to run first before the anchored animation',
+        inject(function($$animation, $$rAF, $rootScope, $rootElement) {
+
+        fromAnchors[0].attr('ng-animate-ref', 'shared');
+        toAnchors[0].attr('ng-animate-ref', 'shared');
+
+        var parent = jqLite('<div></div>');
+        parent.append(fromElement);
+        parent.append(toElement);
+        $rootElement.append(parent);
+
+        fromElement.addClass('group-1');
+        toElement.addClass('group-1');
+
+        // issued first
+        $$animation(toElement, 'enter');
+        $$animation(fromElement, 'leave');
+
+        // issued second
+        $$animation(parent, 'addClass', { addClass: 'red' });
+
+        expect(captureLog.length).toBe(0);
+
+        $rootScope.$digest();
+
+        expect(captureLog[0].element).toBe(parent);
+        expect(captureLog[1].from.element).toBe(fromElement);
+        expect(captureLog[1].to.element).toBe(toElement);
+      }));
+    });
+  });
+
+  describe('[options]', function() {
+    var runner;
+    var defered;
+    var parent;
+    var mockedDriverFn;
+    var mockedPlayerFn;
+
+    beforeEach(module(function($$animationProvider, $provide) {
+      $$animationProvider.drivers.push('mockedTestDriver');
+      $provide.factory('mockedTestDriver', function() {
+        return mockedDriverFn;
+      });
+
+      element = jqLite('<div></div>');
+      parent = jqLite('<div></div>');
+
+      return function($$AnimateRunner, $q, $rootElement, $$body) {
+        $$body.append($rootElement);
+        $rootElement.append(parent);
+
+        mockedDriverFn = function(element, method, options, domOperation) {
+          return {
+            start: function() {
+              return runner = new $$AnimateRunner();
+            }
+          };
+        };
+      };
+    }));
+
+    it('should temporarily assign the provided CSS class for the duration of the animation',
+      inject(function($rootScope, $$animation) {
+
+      parent.append(element);
+
+      $$animation(element, 'enter', {
+        tempClasses: 'temporary fudge'
+      });
+      $rootScope.$digest();
+
+      expect(element).toHaveClass('temporary');
+      expect(element).toHaveClass('fudge');
+
+      runner.end();
+      $rootScope.$digest();
+
+      expect(element).not.toHaveClass('temporary');
+      expect(element).not.toHaveClass('fudge');
+    }));
+
+    it('should add and remove the ng-animate CSS class when the animation is active',
+      inject(function($$animation, $rootScope) {
+
+      parent.append(element);
+
+      $$animation(element, 'enter');
+      $rootScope.$digest();
+      expect(element).toHaveClass('ng-animate');
+
+      runner.end();
+      $rootScope.$digest();
+
+      expect(element).not.toHaveClass('ng-animate');
+    }));
+
+
+    it('should apply the `ng-animate` and temporary CSS classes before the driver is invoked', function() {
+      var capturedElementClasses;
+
+      parent.append(element);
+
+      module(function($provide) {
+        $provide.factory('mockedTestDriver', function() {
+          return function(details) {
+            capturedElementClasses = details.element.attr('class');
+          };
+        });
+      });
+
+      inject(function($$animation, $rootScope) {
+        parent.append(element);
+
+        $$animation(element, 'enter', {
+          tempClasses: 'temp-class-name'
+        });
+        $rootScope.$digest();
+
+        expect(capturedElementClasses).toMatch(/\bng-animate\b/);
+        expect(capturedElementClasses).toMatch(/\btemp-class-name\b/);
+      });
+    });
+
+    it('should perform the DOM operation at the end of the animation if the driver doesn\'t run it already',
+      inject(function($$animation, $rootScope) {
+
+      parent.append(element);
+
+      var domOperationFired = false;
+      $$animation(element, 'enter', {
+        domOperation: function() {
+          domOperationFired = true;
+        }
+      });
+
+      $rootScope.$digest();
+
+      expect(domOperationFired).toBeFalsy();
+      runner.end();
+      $rootScope.$digest();
+
+      expect(domOperationFired).toBeTruthy();
+    }));
+
+    it('should still apply the `from` and `to` styling even if no driver was detected', function() {
+      module(function($$animationProvider) {
+        $$animationProvider.drivers.length = 0;
+      });
+      inject(function($$animation, $rootScope) {
+        $$animation(element, 'event', {
+          from: { background: 'red' },
+          to: { background: 'blue' }
+        });
+
+        expect(element.css('background')).toContain('blue');
+      });
+    });
+
+    it('should still apply the `from` and `to` styling even if the driver does not do the job', function() {
+      module(function($$animationProvider, $provide) {
+        $$animationProvider.drivers[0] = 'dumbDriver';
+        $provide.factory('dumbDriver', function($q) {
+          return function stepFn() {
+            return $q.when(true);
+          };
+        });
+      });
+      inject(function($$animation, $rootScope, $$rAF) {
+        element.addClass('four');
+
+        var completed = false;
+        $$animation(element, 'event', {
+          from: { background: 'red' },
+          to: { background: 'blue', 'font-size': '50px' }
+        }).then(function() {
+          completed = true;
+        });
+
+        $rootScope.$digest(); //runs the animation
+        $rootScope.$digest(); //flushes the step code
+        $$rAF.flush(); //runs the $$animation promise
+        $rootScope.$digest(); //the runner promise
+
+        expect(completed).toBe(true);
+        expect(element.css('background')).toContain('blue');
+        expect(element.css('font-size')).toBe('50px');
+      });
+    });
+
+    it('should still resolve the `addClass` and `removeClass` classes even if no driver was detected', function() {
+      module(function($$animationProvider) {
+        $$animationProvider.drivers.length = 0;
+      });
+      inject(function($$animation, $rootScope) {
+        element.addClass('four');
+
+        $$animation(element, 'event', {
+          addClass: 'one two three',
+          removeClass: 'four'
+        });
+
+        expect(element).toHaveClass('one');
+        expect(element).toHaveClass('two');
+        expect(element).toHaveClass('three');
+        expect(element).not.toHaveClass('four');
+      });
+    });
+
+    it('should still resolve the `addClass` and `removeClass` classes even if the driver does not do the job', function() {
+      module(function($$animationProvider, $provide) {
+        $$animationProvider.drivers[0] = 'dumbDriver';
+        $provide.factory('dumbDriver', function($$AnimateRunner) {
+          return function initFn() {
+            return function stepFn() {
+              return new $$AnimateRunner();
+            };
+          };
+        });
+      });
+      inject(function($$animation, $rootScope, $$rAF) {
+        element.addClass('four');
+
+        var completed = false;
+        var runner = $$animation(element, 'event', {
+          addClass: 'one two three',
+          removeClass: 'four'
+        });
+        runner.then(function() {
+          completed = true;
+        });
+
+        $rootScope.$digest(); //runs the animation
+        $rootScope.$digest(); //flushes the step code
+
+        runner.end();
+        $$rAF.flush(); //runs the $$animation promise
+        $rootScope.$digest(); //the runner promise
+
+        expect(completed).toBe(true);
+        expect(element).toHaveClass('one');
+        expect(element).toHaveClass('two');
+        expect(element).toHaveClass('three');
+        expect(element).not.toHaveClass('four');
+      });
+    });
+  });
+});
diff --git a/test/ngAnimate/bodySpec.js b/test/ngAnimate/bodySpec.js
new file mode 100644
index 000000000000..f87dabf1e355
--- /dev/null
+++ b/test/ngAnimate/bodySpec.js
@@ -0,0 +1,9 @@
+'use strict';
+
+describe('$$body', function() {
+  beforeEach(module('ngAnimate'));
+
+  it("should inject $document", inject(function($$body, $document) {
+    expect($$body).toEqual(jqLite($document[0].body));
+  }));
+});
diff --git a/test/ngAnimate/integrationSpec.js b/test/ngAnimate/integrationSpec.js
new file mode 100644
index 000000000000..b56bb78c4866
--- /dev/null
+++ b/test/ngAnimate/integrationSpec.js
@@ -0,0 +1,572 @@
+'use strict';
+
+describe('ngAnimate integration tests', function() {
+
+  beforeEach(module('ngAnimate'));
+
+  var element, html, ss;
+  beforeEach(module(function() {
+    return function($rootElement, $document, $$body, $window, $animate) {
+      $animate.enabled(true);
+
+      ss = createMockStyleSheet($document, $window);
+
+      var body = $$body;
+      html = function(element) {
+        body.append($rootElement);
+        $rootElement.append(element);
+      };
+    };
+  }));
+
+  afterEach(function() {
+    dealoc(element);
+    ss.destroy();
+  });
+
+  describe('CSS animations', function() {
+    if (!browserSupportsCssAnimations()) return;
+
+    they('should render an $prop animation',
+      ['enter', 'leave', 'move', 'addClass', 'removeClass', 'setClass'], function(event) {
+
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF) {
+        element = jqLite('<div class="animate-me"></div>');
+        $compile(element)($rootScope);
+
+        var className = 'klass';
+        var addClass, removeClass;
+        var parent = jqLite('<div></div>');
+        html(parent);
+
+        var setupClass, activeClass;
+        var args;
+        var classRuleSuffix = '';
+
+        switch (event) {
+          case 'enter':
+          case 'move':
+            setupClass = 'ng-' + event;
+            activeClass = 'ng-' + event + '-active';
+            args = [element, parent];
+            break;
+
+          case 'leave':
+            parent.append(element);
+            setupClass = 'ng-' + event;
+            activeClass = 'ng-' + event + '-active';
+            args = [element];
+            break;
+
+          case 'addClass':
+            parent.append(element);
+            classRuleSuffix = '.add';
+            setupClass = className + '-add';
+            activeClass = className + '-add-active';
+            addClass = className;
+            args = [element, className];
+            break;
+
+          case 'removeClass':
+            parent.append(element);
+            setupClass = className + '-remove';
+            activeClass = className + '-remove-active';
+            element.addClass(className);
+            args = [element, className];
+            break;
+
+          case 'setClass':
+            parent.append(element);
+            addClass = className;
+            removeClass = 'removing-class';
+            setupClass = addClass + '-add ' + removeClass + '-remove';
+            activeClass = addClass + '-add-active ' + removeClass + '-remove-active';
+            element.addClass(removeClass);
+            args = [element, addClass, removeClass];
+            break;
+        }
+
+        ss.addRule('.animate-me', 'transition:2s linear all;');
+
+        var runner = $animate[event].apply($animate, args);
+        $rootScope.$digest();
+
+        var animationCompleted = false;
+        runner.then(function() {
+          animationCompleted = true;
+        });
+
+        expect(element).toHaveClass(setupClass);
+        $$rAF.flush();
+        expect(element).toHaveClass(activeClass);
+
+        browserTrigger(element, 'transitionend', { timeStamp: Date.now(), elapsedTime: 2 });
+
+        expect(element).not.toHaveClass(setupClass);
+        expect(element).not.toHaveClass(activeClass);
+
+        $rootScope.$digest();
+
+        expect(animationCompleted).toBe(true);
+      });
+    });
+
+    it('should not throw an error if the element is orphaned before the CSS animation starts',
+      inject(function($rootScope, $rootElement, $animate, $$rAF) {
+
+      ss.addRule('.animate-me', 'transition:2s linear all;');
+
+      var parent = jqLite('<div></div>');
+      html(parent);
+
+      var element = jqLite('<div class="animate-me">DOING</div>');
+      parent.append(element);
+
+      $animate.addClass(parent, 'on');
+      $animate.addClass(element, 'on');
+      $rootScope.$digest();
+
+      // this will run the first class-based animation
+      $$rAF.flush();
+
+      element.remove();
+
+      expect(function() {
+        $$rAF.flush();
+      }).not.toThrow();
+
+      dealoc(element);
+    }));
+
+    it('should always synchronously add css classes in order for child animations to animate properly',
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF, $document) {
+
+      ss.addRule('.animations-enabled .animate-me.ng-enter', 'transition:2s linear all;');
+
+      element = jqLite('<div ng-class="{\'animations-enabled\':exp}"></div>');
+      var child = jqLite('<div ng-if="exp" class="animate-me"></div>');
+
+      element.append(child);
+      $rootElement.append(element);
+      jqLite($document[0].body).append($rootElement);
+
+      $compile(element)($rootScope);
+
+      $rootScope.exp = true;
+      $rootScope.$digest();
+
+      child = element.find('div');
+
+      expect(element).toHaveClass('animations-enabled');
+      expect(child).toHaveClass('ng-enter');
+
+      $$rAF.flush();
+
+      expect(child).toHaveClass('ng-enter-active');
+
+      browserTrigger(child, 'transitionend', { timeStamp: Date.now(), elapsedTime: 2 });
+
+      expect(child).not.toHaveClass('ng-enter-active');
+      expect(child).not.toHaveClass('ng-enter');
+    }));
+
+    it('should synchronously add/remove ng-class expressions in time for other animations to run on the same element',
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF, $document) {
+
+      ss.addRule('.animate-me.ng-enter.on', 'transition:2s linear all;');
+
+      element = jqLite('<div><div ng-if="exp" ng-class="{on:exp2}" class="animate-me"></div></div>');
+
+      $rootElement.append(element);
+      jqLite($document[0].body).append($rootElement);
+
+      $compile(element)($rootScope);
+
+      $rootScope.exp = true;
+      $rootScope.$digest();
+      $$rAF.flush();
+
+      var child = element.find('div');
+
+      expect(child).not.toHaveClass('on');
+      expect(child).not.toHaveClass('ng-enter');
+
+      $rootScope.exp = false;
+      $rootScope.$digest();
+
+      $rootScope.exp = true;
+      $rootScope.exp2 = true;
+      $rootScope.$digest();
+
+      child = element.find('div');
+
+      expect(child).toHaveClass('on');
+      expect(child).toHaveClass('ng-enter');
+
+      $$rAF.flush();
+
+      expect(child).toHaveClass('ng-enter-active');
+
+      browserTrigger(child, 'transitionend', { timeStamp: Date.now(), elapsedTime: 2 });
+
+      expect(child).not.toHaveClass('ng-enter-active');
+      expect(child).not.toHaveClass('ng-enter');
+    }));
+
+    it('should animate ng-class and a structural animation in parallel on the same element',
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF, $document) {
+
+      ss.addRule('.animate-me.ng-enter', 'transition:2s linear all;');
+      ss.addRule('.animate-me.expand', 'transition:5s linear all; font-size:200px;');
+
+      element = jqLite('<div><div ng-if="exp" ng-class="{expand:exp2}" class="animate-me"></div></div>');
+
+      $rootElement.append(element);
+      jqLite($document[0].body).append($rootElement);
+
+      $compile(element)($rootScope);
+
+      $rootScope.exp = true;
+      $rootScope.exp2 = true;
+      $rootScope.$digest();
+
+      var child = element.find('div');
+
+      expect(child).toHaveClass('ng-enter');
+      expect(child).toHaveClass('expand-add');
+      expect(child).toHaveClass('expand');
+
+      $$rAF.flush();
+
+      expect(child).toHaveClass('ng-enter-active');
+      expect(child).toHaveClass('expand-add-active');
+
+      browserTrigger(child, 'transitionend', { timeStamp: Date.now(), elapsedTime: 2 });
+
+      expect(child).not.toHaveClass('ng-enter-active');
+      expect(child).not.toHaveClass('ng-enter');
+      expect(child).not.toHaveClass('expand-add-active');
+      expect(child).not.toHaveClass('expand-add');
+    }));
+
+    it('should only issue a reflow for each parent CSS class change that contains ready-to-fire child animations', function() {
+      module('ngAnimateMock');
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF, $document) {
+        element = jqLite(
+          '<div ng-class="{parent:exp}">' +
+            '<div ng-class="{parent2:exp}">' +
+               '<div ng-repeat="item in items" ng-class="{fade:exp}">' +
+                  '{{ item }}' +
+               '</div>' +
+            '</div>' +
+          '</div>'
+        );
+
+        $rootElement.append(element);
+        jqLite($document[0].body).append($rootElement);
+
+        $compile(element)($rootScope);
+        $rootScope.$digest();
+        expect($animate.reflows).toBe(0);
+
+        $rootScope.exp = true;
+        $rootScope.items = [1,2,3,4,5,6,7,8,9,10];
+
+        $rootScope.$digest();
+        expect($animate.reflows).toBe(2);
+      });
+    });
+
+    it('should issue a reflow for each parent class-based animation that contains active child animations', function() {
+      module('ngAnimateMock');
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF, $document) {
+        element = jqLite(
+          '<div ng-class="{one:exp}">' +
+             '<div ng-if="exp"></div>' +
+          '</div>' +
+          '<div ng-class="{two:exp}">' +
+             '<div ng-if="exp"></div>' +
+          '</div>' +
+          '<div ng-class="{three:exp}">' +
+             '<div ng-if="false"></div>' +
+          '</div>' +
+          '<div ng-class="{four:exp}"></div>'
+        );
+
+        $rootElement.append(element);
+        jqLite($document[0].body).append($rootElement);
+
+        $compile(element)($rootScope);
+        $rootScope.$digest();
+        expect($animate.reflows).toBe(0);
+
+        $rootScope.exp = true;
+        $rootScope.$digest();
+        expect($animate.reflows).toBe(2);
+      });
+    });
+
+    it('should only issue one reflow for class-based animations if none of them have children with queued animations', function() {
+      module('ngAnimateMock');
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF, $document) {
+        element = jqLite(
+          '<div ng-class="{one:exp}">' +
+             '<div ng-if="exp2"></div>' +
+          '</div>' +
+          '<div ng-class="{two:exp}">' +
+             '<div ng-if="exp2"></div>' +
+          '</div>' +
+          '<div ng-class="{three:exp}"></div>'
+        );
+
+        $rootElement.append(element);
+        jqLite($document[0].body).append($rootElement);
+
+        $compile(element)($rootScope);
+        $rootScope.$digest();
+        expect($animate.reflows).toBe(0);
+
+        $rootScope.exp = true;
+        $rootScope.$digest();
+        expect($animate.reflows).toBe(1);
+
+        $rootScope.exp2 = true;
+        $rootScope.$digest();
+        expect($animate.reflows).toBe(2);
+      });
+    });
+
+    it('should always issue atleast one reflow incase there are no parent class-based animations', function() {
+      module('ngAnimateMock');
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF, $document) {
+        element = jqLite(
+          '<div ng-repeat="item in items" ng-class="{someAnimation:exp}">' +
+            '{{ item }}' +
+          '</div>'
+        );
+
+        $rootElement.append(element);
+        jqLite($document[0].body).append($rootElement);
+
+        $compile(element)($rootScope);
+        $rootScope.$digest();
+        expect($animate.reflows).toBe(0);
+
+        $rootScope.exp = true;
+        $rootScope.items = [1,2,3,4,5,6,7,8,9,10];
+        $rootScope.$digest();
+
+        expect($animate.reflows).toBe(1);
+      });
+    });
+  });
+
+  describe('JS animations', function() {
+    they('should render an $prop animation',
+      ['enter', 'leave', 'move', 'addClass', 'removeClass', 'setClass'], function(event) {
+
+      var endAnimation;
+      var animateCompleteCallbackFired = true;
+
+      module(function($animateProvider) {
+        $animateProvider.register('.animate-me', function() {
+          var animateFactory = {};
+          animateFactory[event] = function(element, addClass, removeClass, done) {
+            endAnimation = arguments[arguments.length - 2]; // the done method is the 2nd last one
+            return function(status) {
+              animateCompleteCallbackFired = status === false;
+            };
+          };
+          return animateFactory;
+        });
+      });
+
+      inject(function($animate, $compile, $rootScope, $rootElement, $$rAF) {
+        element = jqLite('<div class="animate-me"></div>');
+        $compile(element)($rootScope);
+
+        var className = 'klass';
+        var addClass, removeClass;
+        var parent = jqLite('<div></div>');
+        html(parent);
+
+        var args;
+        switch (event) {
+          case 'enter':
+          case 'move':
+            args = [element, parent];
+            break;
+
+          case 'leave':
+            parent.append(element);
+            args = [element];
+            break;
+
+          case 'addClass':
+            parent.append(element);
+            args = [element, className];
+            break;
+
+          case 'removeClass':
+            parent.append(element);
+            element.addClass(className);
+            args = [element, className];
+            break;
+
+          case 'setClass':
+            parent.append(element);
+            addClass = className;
+            removeClass = 'removing-class';
+            element.addClass(removeClass);
+            args = [element, addClass, removeClass];
+            break;
+        }
+
+        var runner = $animate[event].apply($animate, args);
+        var animationCompleted = false;
+        runner.then(function() {
+          animationCompleted = true;
+        });
+
+        $rootScope.$digest();
+
+        expect(isFunction(endAnimation)).toBe(true);
+
+        endAnimation();
+        $$rAF.flush();
+        expect(animateCompleteCallbackFired).toBe(true);
+
+        $rootScope.$digest();
+        expect(animationCompleted).toBe(true);
+      });
+    });
+
+    they('should not wait for a parent\'s classes to resolve if a $prop is animation used for children',
+      ['beforeAddClass', 'beforeRemoveClass', 'beforeSetClass'], function(phase) {
+
+      var capturedChildClasses;
+      var endParentAnimationFn;
+
+      module(function($animateProvider) {
+        $animateProvider.register('.parent-man', function() {
+          var animateFactory = {};
+          animateFactory[phase] = function(element, addClass, removeClass, done) {
+            // this will wait until things are over
+            endParentAnimationFn = done;
+          };
+          return animateFactory;
+        });
+
+        $animateProvider.register('.child-man', function() {
+          return {
+            enter: function(element, done) {
+              capturedChildClasses = element.parent().attr('class');
+              done();
+            }
+          };
+        });
+      });
+
+      inject(function($animate, $compile, $rootScope, $rootElement) {
+        element = jqLite('<div class="parent-man"></div>');
+        var child = jqLite('<div class="child-man"></div>');
+
+        html(element);
+        $compile(element)($rootScope);
+
+        $animate.enter(child, element);
+        switch (phase) {
+          case 'beforeAddClass':
+            $animate.addClass(element, 'cool');
+            break;
+
+          case 'beforeSetClass':
+            $animate.setClass(element, 'cool');
+            break;
+
+          case 'beforeRemoveClass':
+            element.addClass('cool');
+            $animate.removeClass(element, 'cool');
+            break;
+        }
+
+        $rootScope.$digest();
+
+        expect(endParentAnimationFn).toBeTruthy();
+
+        // the spaces are used so that ` cool ` can be matched instead
+        // of just a substring like `cool-add`.
+        var safeClassMatchString = ' ' + capturedChildClasses + ' ';
+        if (phase === 'beforeRemoveClass') {
+          expect(safeClassMatchString).toContain(' cool ');
+        } else {
+          expect(safeClassMatchString).not.toContain(' cool ');
+        }
+      });
+    });
+
+    they('should have the parent\'s classes already applied in time for the children if $prop is used',
+      ['addClass', 'removeClass', 'setClass'], function(phase) {
+
+      var capturedChildClasses;
+      var endParentAnimationFn;
+
+      module(function($animateProvider) {
+        $animateProvider.register('.parent-man', function() {
+          var animateFactory = {};
+          animateFactory[phase] = function(element, addClass, removeClass, done) {
+            // this will wait until things are over
+            endParentAnimationFn = done;
+          };
+          return animateFactory;
+        });
+
+        $animateProvider.register('.child-man', function() {
+          return {
+            enter: function(element, done) {
+              capturedChildClasses = element.parent().attr('class');
+              done();
+            }
+          };
+        });
+      });
+
+      inject(function($animate, $compile, $rootScope, $rootElement) {
+        element = jqLite('<div class="parent-man"></div>');
+        var child = jqLite('<div class="child-man"></div>');
+
+        html(element);
+        $compile(element)($rootScope);
+
+        $animate.enter(child, element);
+        switch (phase) {
+          case 'addClass':
+            $animate.addClass(element, 'cool');
+            break;
+
+          case 'setClass':
+            $animate.setClass(element, 'cool');
+            break;
+
+          case 'removeClass':
+            element.addClass('cool');
+            $animate.removeClass(element, 'cool');
+            break;
+        }
+
+        $rootScope.$digest();
+
+        expect(endParentAnimationFn).toBeTruthy();
+
+        // the spaces are used so that ` cool ` can be matched instead
+        // of just a substring like `cool-add`.
+        var safeClassMatchString = ' ' + capturedChildClasses + ' ';
+        if (phase === 'removeClass') {
+          expect(safeClassMatchString).not.toContain(' cool ');
+        } else {
+          expect(safeClassMatchString).toContain(' cool ');
+        }
+      });
+    });
+  });
+});
diff --git a/test/ngAria/ariaSpec.js b/test/ngAria/ariaSpec.js
index 905196340f8a..864f856ed271 100644
--- a/test/ngAria/ariaSpec.js
+++ b/test/ngAria/ariaSpec.js
@@ -5,6 +5,10 @@ describe('$aria', function() {
 
   beforeEach(module('ngAria'));
 
+  afterEach(function() {
+    dealoc(element);
+  });
+
   function injectScopeAndCompiler() {
     return inject(function(_$compile_, _$rootScope_) {
       $compile = _$compile_;
@@ -12,7 +16,7 @@ describe('$aria', function() {
     });
   }
 
-  function compileInput(inputHtml) {
+  function compileElement(inputHtml) {
     element = $compile(inputHtml)(scope);
     scope.$digest();
   }
@@ -21,7 +25,7 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should attach aria-hidden to ng-show', function() {
-      compileInput('<div ng-show="val"></div>');
+      compileElement('<div ng-show="val"></div>');
       scope.$apply('val = false');
       expect(element.attr('aria-hidden')).toBe('true');
 
@@ -30,7 +34,7 @@ describe('$aria', function() {
     });
 
     it('should attach aria-hidden to ng-hide', function() {
-      compileInput('<div ng-hide="val"></div>');
+      compileElement('<div ng-hide="val"></div>');
       scope.$apply('val = false');
       expect(element.attr('aria-hidden')).toBe('false');
 
@@ -39,7 +43,7 @@ describe('$aria', function() {
     });
 
     it('should not change aria-hidden if it is already present on ng-show', function() {
-      compileInput('<div ng-show="val" aria-hidden="userSetValue"></div>');
+      compileElement('<div ng-show="val" aria-hidden="userSetValue"></div>');
       expect(element.attr('aria-hidden')).toBe('userSetValue');
 
       scope.$apply('val = true');
@@ -47,12 +51,37 @@ describe('$aria', function() {
     });
 
     it('should not change aria-hidden if it is already present on ng-hide', function() {
-      compileInput('<div ng-hide="val" aria-hidden="userSetValue"></div>');
+      compileElement('<div ng-hide="val" aria-hidden="userSetValue"></div>');
       expect(element.attr('aria-hidden')).toBe('userSetValue');
 
       scope.$apply('val = true');
       expect(element.attr('aria-hidden')).toBe('userSetValue');
     });
+
+    it('should always set aria-hidden to a boolean value', function() {
+      compileElement('<div ng-hide="val"></div>');
+
+      scope.$apply('val = "test angular"');
+      expect(element.attr('aria-hidden')).toBe('true');
+
+      scope.$apply('val = null');
+      expect(element.attr('aria-hidden')).toBe('false');
+
+      scope.$apply('val = {}');
+      expect(element.attr('aria-hidden')).toBe('true');
+
+
+      compileElement('<div ng-show="val"></div>');
+
+      scope.$apply('val = "test angular"');
+      expect(element.attr('aria-hidden')).toBe('false');
+
+      scope.$apply('val = null');
+      expect(element.attr('aria-hidden')).toBe('true');
+
+      scope.$apply('val = {}');
+      expect(element.attr('aria-hidden')).toBe('false');
+    });
   });
 
 
@@ -64,10 +93,10 @@ describe('$aria', function() {
 
     it('should not attach aria-hidden', function() {
       scope.$apply('val = false');
-      compileInput('<div ng-show="val"></div>');
+      compileElement('<div ng-show="val"></div>');
       expect(element.attr('aria-hidden')).toBeUndefined();
 
-      compileInput('<div ng-hide="val"></div>');
+      compileElement('<div ng-hide="val"></div>');
       expect(element.attr('aria-hidden')).toBeUndefined();
     });
   });
@@ -76,7 +105,7 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should attach itself to input type="checkbox"', function() {
-      compileInput('<input type="checkbox" ng-model="val">');
+      compileElement('<input type="checkbox" ng-model="val">');
 
       scope.$apply('val = true');
       expect(element.attr('aria-checked')).toBe('true');
@@ -151,27 +180,39 @@ describe('$aria', function() {
     });
 
     it('should attach itself to role="radio"', function() {
-      scope.$apply("val = 'one'");
-      compileInput('<div role="radio" ng-model="val" value="{{val}}"></div>');
+      scope.val = 'one';
+      compileElement('<div role="radio" ng-model="val" value="one"></div>');
       expect(element.attr('aria-checked')).toBe('true');
+
+      scope.$apply("val = 'two'");
+      expect(element.attr('aria-checked')).toBe('false');
     });
 
     it('should attach itself to role="checkbox"', function() {
       scope.val = true;
-      compileInput('<div role="checkbox" ng-model="val"></div>');
+      compileElement('<div role="checkbox" ng-model="val"></div>');
       expect(element.attr('aria-checked')).toBe('true');
+
+      scope.$apply('val = false');
+      expect(element.attr('aria-checked')).toBe('false');
     });
 
     it('should attach itself to role="menuitemradio"', function() {
       scope.val = 'one';
-      compileInput('<div role="menuitemradio" ng-model="val" value="{{val}}"></div>');
+      compileElement('<div role="menuitemradio" ng-model="val" value="one"></div>');
       expect(element.attr('aria-checked')).toBe('true');
+
+      scope.$apply("val = 'two'");
+      expect(element.attr('aria-checked')).toBe('false');
     });
 
     it('should attach itself to role="menuitemcheckbox"', function() {
       scope.val = true;
-      compileInput('<div role="menuitemcheckbox" ng-model="val"></div>');
+      compileElement('<div role="menuitemcheckbox" ng-model="val"></div>');
       expect(element.attr('aria-checked')).toBe('true');
+
+      scope.$apply('val = false');
+      expect(element.attr('aria-checked')).toBe('false');
     });
 
     it('should not attach itself if an aria-checked value is already present', function() {
@@ -188,6 +229,50 @@ describe('$aria', function() {
     });
   });
 
+  describe('roles for custom inputs', function() {
+    beforeEach(injectScopeAndCompiler);
+
+    it('should add missing role="button" to custom input', function() {
+      compileElement('<div ng-click="someFunction()"></div>');
+      expect(element.attr('role')).toBe('button');
+    });
+
+    it('should not add role="button" to anchor', function() {
+      compileElement('<a ng-click="someFunction()"></a>');
+      expect(element.attr('role')).not.toBe('button');
+    });
+
+    it('should add missing role="checkbox" to custom input', function() {
+      compileElement('<div type="checkbox" ng-model="val"></div>');
+      expect(element.attr('role')).toBe('checkbox');
+    });
+
+    it('should not add a role to a native checkbox', function() {
+      compileElement('<input type="checkbox" ng-model="val"></div>');
+      expect(element.attr('role')).toBe(undefined);
+    });
+
+    it('should add missing role="radio" to custom input', function() {
+      compileElement('<div type="radio" ng-model="val"></div>');
+      expect(element.attr('role')).toBe('radio');
+    });
+
+    it('should not add a role to a native radio button', function() {
+      compileElement('<input type="radio" ng-model="val"></div>');
+      expect(element.attr('role')).toBe(undefined);
+    });
+
+    it('should add missing role="slider" to custom input', function() {
+      compileElement('<div type="range" ng-model="val"></div>');
+      expect(element.attr('role')).toBe('slider');
+    });
+
+    it('should not add a role to a native range input', function() {
+      compileElement('<input type="range" ng-model="val"></div>');
+      expect(element.attr('role')).toBe(undefined);
+    });
+  });
+
   describe('aria-checked when disabled', function() {
     beforeEach(configAriaProvider({
       ariaChecked: false
@@ -195,16 +280,16 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should not attach aria-checked', function() {
-      compileInput("<div role='radio' ng-model='val' value='{{val}}'></div>");
+      compileElement("<div role='radio' ng-model='val' value='{{val}}'></div>");
       expect(element.attr('aria-checked')).toBeUndefined();
 
-      compileInput("<div role='menuitemradio' ng-model='val' value='{{val}}'></div>");
+      compileElement("<div role='menuitemradio' ng-model='val' value='{{val}}'></div>");
       expect(element.attr('aria-checked')).toBeUndefined();
 
-      compileInput("<div role='checkbox' checked='checked'></div>");
+      compileElement("<div role='checkbox' checked='checked'></div>");
       expect(element.attr('aria-checked')).toBeUndefined();
 
-      compileInput("<div role='menuitemcheckbox' checked='checked'></div>");
+      compileElement("<div role='menuitemcheckbox' checked='checked'></div>");
       expect(element.attr('aria-checked')).toBeUndefined();
     });
   });
@@ -214,7 +299,7 @@ describe('$aria', function() {
 
     it('should attach itself to input elements', function() {
       scope.$apply('val = false');
-      compileInput("<input ng-disabled='val'>");
+      compileElement("<input ng-disabled='val'>");
       expect(element.attr('aria-disabled')).toBe('false');
 
       scope.$apply('val = true');
@@ -223,7 +308,7 @@ describe('$aria', function() {
 
     it('should attach itself to textarea elements', function() {
       scope.$apply('val = false');
-      compileInput('<textarea ng-disabled="val"></textarea>');
+      compileElement('<textarea ng-disabled="val"></textarea>');
       expect(element.attr('aria-disabled')).toBe('false');
 
       scope.$apply('val = true');
@@ -232,7 +317,7 @@ describe('$aria', function() {
 
     it('should attach itself to button elements', function() {
       scope.$apply('val = false');
-      compileInput('<button ng-disabled="val"></button>');
+      compileElement('<button ng-disabled="val"></button>');
       expect(element.attr('aria-disabled')).toBe('false');
 
       scope.$apply('val = true');
@@ -241,7 +326,7 @@ describe('$aria', function() {
 
     it('should attach itself to select elements', function() {
       scope.$apply('val = false');
-      compileInput('<select ng-disabled="val"></select>');
+      compileElement('<select ng-disabled="val"></select>');
       expect(element.attr('aria-disabled')).toBe('false');
 
       scope.$apply('val = true');
@@ -259,6 +344,20 @@ describe('$aria', function() {
       scope.$apply('val = true');
       expectAriaAttrOnEachElement(element, 'aria-disabled', 'userSetValue');
     });
+
+
+    it('should always set aria-disabled to a boolean value', function() {
+      compileElement('<div ng-disabled="val"></div>');
+
+      scope.$apply('val = "test angular"');
+      expect(element.attr('aria-disabled')).toBe('true');
+
+      scope.$apply('val = null');
+      expect(element.attr('aria-disabled')).toBe('false');
+
+      scope.$apply('val = {}');
+      expect(element.attr('aria-disabled')).toBe('true');
+    });
   });
 
   describe('aria-disabled when disabled', function() {
@@ -284,7 +383,7 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should attach aria-invalid to input', function() {
-      compileInput('<input ng-model="txtInput" ng-minlength="10">');
+      compileElement('<input ng-model="txtInput" ng-minlength="10">');
       scope.$apply("txtInput='LTten'");
       expect(element.attr('aria-invalid')).toBe('true');
 
@@ -293,7 +392,7 @@ describe('$aria', function() {
     });
 
     it('should not attach itself if aria-invalid is already present', function() {
-      compileInput('<input ng-model="txtInput" ng-minlength="10" aria-invalid="userSetValue">');
+      compileElement('<input ng-model="txtInput" ng-minlength="10" aria-invalid="userSetValue">');
       scope.$apply("txtInput='LTten'");
       expect(element.attr('aria-invalid')).toBe('userSetValue');
     });
@@ -307,7 +406,7 @@ describe('$aria', function() {
 
     it('should not attach aria-invalid if the option is disabled', function() {
       scope.$apply("txtInput='LTten'");
-      compileInput('<input ng-model="txtInput" ng-minlength="10">');
+      compileElement('<input ng-model="txtInput" ng-minlength="10">');
       expect(element.attr('aria-invalid')).toBeUndefined();
     });
   });
@@ -316,7 +415,7 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should attach aria-required to input', function() {
-      compileInput('<input ng-model="val" required>');
+      compileElement('<input ng-model="val" required>');
       expect(element.attr('aria-required')).toBe('true');
 
       scope.$apply("val='input is valid now'");
@@ -324,7 +423,7 @@ describe('$aria', function() {
     });
 
     it('should attach aria-required to textarea', function() {
-      compileInput('<textarea ng-model="val" required></textarea>');
+      compileElement('<textarea ng-model="val" required></textarea>');
       expect(element.attr('aria-required')).toBe('true');
 
       scope.$apply("val='input is valid now'");
@@ -332,7 +431,7 @@ describe('$aria', function() {
     });
 
     it('should attach aria-required to select', function() {
-      compileInput('<select ng-model="val" required></select>');
+      compileElement('<select ng-model="val" required></select>');
       expect(element.attr('aria-required')).toBe('true');
 
       scope.$apply("val='input is valid now'");
@@ -340,7 +439,7 @@ describe('$aria', function() {
     });
 
     it('should attach aria-required to ngRequired', function() {
-      compileInput('<input ng-model="val" ng-required="true">');
+      compileElement('<input ng-model="val" ng-required="true">');
       expect(element.attr('aria-required')).toBe('true');
 
       scope.$apply("val='input is valid now'");
@@ -348,16 +447,16 @@ describe('$aria', function() {
     });
 
     it('should not attach itself if aria-required is already present', function() {
-      compileInput("<input ng-model='val' required aria-required='userSetValue'>");
+      compileElement("<input ng-model='val' required aria-required='userSetValue'>");
       expect(element.attr('aria-required')).toBe('userSetValue');
 
-      compileInput("<textarea ng-model='val' required aria-required='userSetValue'></textarea>");
+      compileElement("<textarea ng-model='val' required aria-required='userSetValue'></textarea>");
       expect(element.attr('aria-required')).toBe('userSetValue');
 
-      compileInput("<select ng-model='val' required aria-required='userSetValue'></select>");
+      compileElement("<select ng-model='val' required aria-required='userSetValue'></select>");
       expect(element.attr('aria-required')).toBe('userSetValue');
 
-      compileInput("<input ng-model='val' ng-required='true' aria-required='userSetValue'>");
+      compileElement("<input ng-model='val' ng-required='true' aria-required='userSetValue'>");
       expect(element.attr('aria-required')).toBe('userSetValue');
     });
   });
@@ -369,13 +468,13 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should not add the aria-required attribute', function() {
-      compileInput("<input ng-model='val' required>");
+      compileElement("<input ng-model='val' required>");
       expect(element.attr('aria-required')).toBeUndefined();
 
-      compileInput("<textarea ng-model='val' required></textarea>");
+      compileElement("<textarea ng-model='val' required></textarea>");
       expect(element.attr('aria-required')).toBeUndefined();
 
-      compileInput("<select ng-model='val' required></select>");
+      compileElement("<select ng-model='val' required></select>");
       expect(element.attr('aria-required')).toBeUndefined();
     });
   });
@@ -384,20 +483,20 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should attach itself to textarea', function() {
-      compileInput('<textarea ng-model="val"></textarea>');
+      compileElement('<textarea ng-model="val"></textarea>');
       expect(element.attr('aria-multiline')).toBe('true');
     });
 
     it('should attach itself role="textbox"', function() {
-      compileInput('<div role="textbox" ng-model="val"></div>');
+      compileElement('<div role="textbox" ng-model="val"></div>');
       expect(element.attr('aria-multiline')).toBe('true');
     });
 
     it('should not attach itself if aria-multiline is already present', function() {
-      compileInput('<textarea aria-multiline="userSetValue"></textarea>');
+      compileElement('<textarea aria-multiline="userSetValue"></textarea>');
       expect(element.attr('aria-multiline')).toBe('userSetValue');
 
-      compileInput('<div role="textbox" aria-multiline="userSetValue"></div>');
+      compileElement('<div role="textbox" aria-multiline="userSetValue"></div>');
       expect(element.attr('aria-multiline')).toBe('userSetValue');
     });
   });
@@ -409,12 +508,12 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should not attach itself to textarea', function() {
-      compileInput('<textarea></textarea>');
+      compileElement('<textarea></textarea>');
       expect(element.attr('aria-multiline')).toBeUndefined();
     });
 
     it('should not attach itself role="textbox"', function() {
-      compileInput('<div role="textbox"></div>');
+      compileElement('<div role="textbox"></div>');
       expect(element.attr('aria-multiline')).toBeUndefined();
     });
   });
@@ -450,6 +549,36 @@ describe('$aria', function() {
       expectAriaAttrOnEachElement(element, 'aria-valuemin', 'userSetValue2');
       expectAriaAttrOnEachElement(element, 'aria-valuemax', 'userSetValue3');
     });
+
+
+    it('should update `aria-valuemin/max` when `min/max` changes dynamically', function() {
+      scope.$apply('min = 25; max = 75');
+      compileElement('<input type="range" ng-model="val" min="{{min}}" max="{{max}}" />');
+
+      expect(element.attr('aria-valuemin')).toBe('25');
+      expect(element.attr('aria-valuemax')).toBe('75');
+
+      scope.$apply('min = 0');
+      expect(element.attr('aria-valuemin')).toBe('0');
+
+      scope.$apply('max = 100');
+      expect(element.attr('aria-valuemax')).toBe('100');
+    });
+
+
+    it('should update `aria-valuemin/max` when `ng-min/ng-max` changes dynamically', function() {
+      scope.$apply('min = 25; max = 75');
+      compileElement('<input type="range" ng-model="val" ng-min="min" ng-max="max" />');
+
+      expect(element.attr('aria-valuemin')).toBe('25');
+      expect(element.attr('aria-valuemax')).toBe('75');
+
+      scope.$apply('min = 0');
+      expect(element.attr('aria-valuemin')).toBe('0');
+
+      scope.$apply('max = 100');
+      expect(element.attr('aria-valuemax')).toBe('100');
+    });
   });
 
   describe('announcing ngMessages', function() {
@@ -472,12 +601,12 @@ describe('$aria', function() {
     it('should not attach itself', function() {
       scope.$apply('val = 50');
 
-      compileInput('<input type="range" ng-model="val" min="0" max="100">');
+      compileElement('<input type="range" ng-model="val" min="0" max="100">');
       expect(element.attr('aria-valuenow')).toBeUndefined();
       expect(element.attr('aria-valuemin')).toBeUndefined();
       expect(element.attr('aria-valuemax')).toBeUndefined();
 
-      compileInput('<div role="progressbar" min="0" max="100" ng-model="val">');
+      compileElement('<div role="progressbar" min="0" max="100" ng-model="val">');
       expect(element.attr('aria-valuenow')).toBeUndefined();
       expect(element.attr('aria-valuemin')).toBeUndefined();
       expect(element.attr('aria-valuemax')).toBeUndefined();
@@ -488,32 +617,32 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should attach tabindex to role="checkbox", ng-click, and ng-dblclick', function() {
-      compileInput('<div role="checkbox" ng-model="val"></div>');
+      compileElement('<div role="checkbox" ng-model="val"></div>');
       expect(element.attr('tabindex')).toBe('0');
 
-      compileInput('<div ng-click="someAction()"></div>');
+      compileElement('<div ng-click="someAction()"></div>');
       expect(element.attr('tabindex')).toBe('0');
 
-      compileInput('<div ng-dblclick="someAction()"></div>');
+      compileElement('<div ng-dblclick="someAction()"></div>');
       expect(element.attr('tabindex')).toBe('0');
     });
 
     it('should not attach tabindex if it is already on an element', function() {
-      compileInput('<div role="button" tabindex="userSetValue"></div>');
+      compileElement('<div role="button" tabindex="userSetValue"></div>');
       expect(element.attr('tabindex')).toBe('userSetValue');
 
-      compileInput('<div role="checkbox" tabindex="userSetValue"></div>');
+      compileElement('<div role="checkbox" tabindex="userSetValue"></div>');
       expect(element.attr('tabindex')).toBe('userSetValue');
 
-      compileInput('<div ng-click="someAction()" tabindex="userSetValue"></div>');
+      compileElement('<div ng-click="someAction()" tabindex="userSetValue"></div>');
       expect(element.attr('tabindex')).toBe('userSetValue');
 
-      compileInput('<div ng-dblclick="someAction()" tabindex="userSetValue"></div>');
+      compileElement('<div ng-dblclick="someAction()" tabindex="userSetValue"></div>');
       expect(element.attr('tabindex')).toBe('userSetValue');
     });
 
     it('should set proper tabindex values for radiogroup', function() {
-      compileInput('<div role="radiogroup">' +
+      compileElement('<div role="radiogroup">' +
                      '<div role="radio" ng-model="val" value="one">1</div>' +
                      '<div role="radio" ng-model="val" value="two">2</div>' +
                    '</div>');
@@ -538,7 +667,7 @@ describe('$aria', function() {
 
     var clickFn;
 
-    it('should a trigger click from the keyboard', function() {
+    it('should trigger a click from the keyboard', function() {
       scope.someAction = function() {};
 
       var elements = $compile('<section>' +
@@ -560,13 +689,35 @@ describe('$aria', function() {
       expect(clickFn).toHaveBeenCalledWith('li');
     });
 
+    it('should trigger a click in browsers that provide event.which instead of event.keyCode', function() {
+      scope.someAction = function() {};
+
+      var elements = $compile('<section>' +
+      '<div class="div-click" ng-click="someAction(\'div\')" tabindex="0"></div>' +
+      '<ul><li ng-click="someAction( \'li\')" tabindex="0"></li></ul>' +
+      '</section>')(scope);
+
+      scope.$digest();
+
+      clickFn = spyOn(scope, 'someAction');
+
+      var divElement = elements.find('div');
+      var liElement = elements.find('li');
+
+      divElement.triggerHandler({type: 'keypress', which: 32});
+      liElement.triggerHandler({type: 'keypress', which: 32});
+
+      expect(clickFn).toHaveBeenCalledWith('div');
+      expect(clickFn).toHaveBeenCalledWith('li');
+    });
+
     it('should not override existing ng-keypress', function() {
       scope.someOtherAction = function() {};
       var keypressFn = spyOn(scope, 'someOtherAction');
 
       scope.someAction = function() {};
       clickFn = spyOn(scope, 'someAction');
-      compileInput('<div ng-click="someAction()" ng-keypress="someOtherAction()" tabindex="0"></div>');
+      compileElement('<div ng-click="someAction()" ng-keypress="someOtherAction()" tabindex="0"></div>');
 
       element.triggerHandler({type: 'keypress', keyCode: 32});
 
@@ -575,7 +726,7 @@ describe('$aria', function() {
     });
 
     it('should update bindings when keypress handled', function() {
-      compileInput('<div ng-click="text = \'clicked!\'">{{text}}</div>');
+      compileElement('<div ng-click="text = \'clicked!\'">{{text}}</div>');
       expect(element.text()).toBe('');
       spyOn(scope.$root, '$digest').andCallThrough();
       element.triggerHandler({ type: 'keypress', keyCode: 13 });
@@ -584,22 +735,34 @@ describe('$aria', function() {
     });
 
     it('should pass $event to ng-click handler as local', function() {
-      compileInput('<div ng-click="event = $event">{{event.type}}' +
-                   '{{event.keyCode}}</div>');
+      compileElement('<div ng-click="event = $event">{{event.type}}' +
+                      '{{event.keyCode}}</div>');
       expect(element.text()).toBe('');
       element.triggerHandler({ type: 'keypress', keyCode: 13 });
       expect(element.text()).toBe('keypress13');
     });
 
     it('should not bind keypress to elements not in the default config', function() {
-      compileInput('<button ng-click="event = $event">{{event.type}}{{event.keyCode}}</button>');
+      compileElement('<button ng-click="event = $event">{{event.type}}{{event.keyCode}}</button>');
       expect(element.text()).toBe('');
       element.triggerHandler({ type: 'keypress', keyCode: 13 });
       expect(element.text()).toBe('');
     });
   });
 
-  describe('actions when bindKeypress set to false', function() {
+  describe('actions when bindRoleForClick is set to false', function() {
+    beforeEach(configAriaProvider({
+      bindRoleForClick: false
+    }));
+    beforeEach(injectScopeAndCompiler);
+
+    it('should not add a button role', function() {
+      compileElement('<radio-group ng-click="something"></radio-group>');
+      expect(element.attr('role')).toBeUndefined();
+    });
+  });
+
+  describe('actions when bindKeypress is set to false', function() {
     beforeEach(configAriaProvider({
       bindKeypress: false
     }));
@@ -624,16 +787,16 @@ describe('$aria', function() {
     beforeEach(injectScopeAndCompiler);
 
     it('should not add a tabindex attribute', function() {
-      compileInput('<div role="button"></div>');
+      compileElement('<div role="button"></div>');
       expect(element.attr('tabindex')).toBeUndefined();
 
-      compileInput('<div role="checkbox"></div>');
+      compileElement('<div role="checkbox"></div>');
       expect(element.attr('tabindex')).toBeUndefined();
 
-      compileInput('<div ng-click="someAction()"></div>');
+      compileElement('<div ng-click="someAction()"></div>');
       expect(element.attr('tabindex')).toBeUndefined();
 
-      compileInput('<div ng-dblclick="someAction()"></div>');
+      compileElement('<div ng-dblclick="someAction()"></div>');
       expect(element.attr('tabindex')).toBeUndefined();
     });
   });
diff --git a/test/ngCookies/cookieStoreSpec.js b/test/ngCookies/cookieStoreSpec.js
new file mode 100644
index 000000000000..20436761b9f3
--- /dev/null
+++ b/test/ngCookies/cookieStoreSpec.js
@@ -0,0 +1,27 @@
+'use strict';
+
+describe('$cookieStore', function() {
+
+  beforeEach(module('ngCookies', {
+    $cookies: jasmine.createSpyObj('$cookies', ['getObject', 'putObject', 'remove'])
+  }));
+
+
+  it('should get cookie', inject(function($cookieStore, $cookies) {
+    $cookies.getObject.andReturn('value');
+    expect($cookieStore.get('name')).toBe('value');
+    expect($cookies.getObject).toHaveBeenCalledWith('name');
+  }));
+
+
+  it('should put cookie', inject(function($cookieStore, $cookies) {
+    $cookieStore.put('name', 'value');
+    expect($cookies.putObject).toHaveBeenCalledWith('name', 'value');
+  }));
+
+
+  it('should remove cookie', inject(function($cookieStore, $cookies) {
+    $cookieStore.remove('name');
+    expect($cookies.remove).toHaveBeenCalledWith('name');
+  }));
+ });
diff --git a/test/ngCookies/cookieWriterSpec.js b/test/ngCookies/cookieWriterSpec.js
new file mode 100644
index 000000000000..e94f2b16e7c7
--- /dev/null
+++ b/test/ngCookies/cookieWriterSpec.js
@@ -0,0 +1,198 @@
+'use strict';
+
+describe('$$cookieWriter', function() {
+  var $$cookieWriter;
+
+  function deleteAllCookies() {
+    var cookies = document.cookie.split(";");
+    var path = location.pathname;
+
+    for (var i = 0; i < cookies.length; i++) {
+      var cookie = cookies[i];
+      var eqPos = cookie.indexOf("=");
+      var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+      var parts = path.split('/');
+      while (parts.length) {
+        document.cookie = name + "=;path=" + (parts.join('/') || '/') + ";expires=Thu, 01 Jan 1970 00:00:00 GMT";
+        parts.pop();
+      }
+    }
+  }
+
+  beforeEach(function() {
+    deleteAllCookies();
+    expect(document.cookie).toEqual('');
+
+    module('ngCookies');
+    inject(function(_$$cookieWriter_) {
+      $$cookieWriter = _$$cookieWriter_;
+    });
+  });
+
+
+  afterEach(function() {
+    deleteAllCookies();
+    expect(document.cookie).toEqual('');
+  });
+
+
+  describe('remove via $$cookieWriter(cookieName, undefined)', function() {
+
+    it('should remove a cookie when it is present', function() {
+      document.cookie = 'foo=bar;path=/';
+
+      $$cookieWriter('foo', undefined);
+
+      expect(document.cookie).toEqual('');
+    });
+
+
+    it('should do nothing when an nonexisting cookie is being removed', function() {
+      $$cookieWriter('doesntexist', undefined);
+      expect(document.cookie).toEqual('');
+    });
+  });
+
+
+  describe('put via $$cookieWriter(cookieName, string)', function() {
+
+    it('should create and store a cookie', function() {
+      $$cookieWriter('cookieName', 'cookie=Value');
+      expect(document.cookie).toMatch(/cookieName=cookie%3DValue;? ?/);
+    });
+
+
+    it('should overwrite an existing unsynced cookie', function() {
+      document.cookie = "cookie=new;path=/";
+
+      var oldVal = $$cookieWriter('cookie', 'newer');
+
+      expect(document.cookie).toEqual('cookie=newer');
+      expect(oldVal).not.toBeDefined();
+    });
+
+    it('should encode both name and value', function() {
+      $$cookieWriter('cookie1=', 'val;ue');
+      $$cookieWriter('cookie2=bar;baz', 'val=ue');
+
+      var rawCookies = document.cookie.split("; "); //order is not guaranteed, so we need to parse
+      expect(rawCookies.length).toEqual(2);
+      expect(rawCookies).toContain('cookie1%3D=val%3Bue');
+      expect(rawCookies).toContain('cookie2%3Dbar%3Bbaz=val%3Due');
+    });
+
+    it('should log warnings when 4kb per cookie storage limit is reached', inject(function($log) {
+      var i, longVal = '', cookieStr;
+
+      for (i = 0; i < 4083; i++) {
+        longVal += 'x';
+      }
+
+      cookieStr = document.cookie;
+      $$cookieWriter('x', longVal); //total size 4093-4096, so it should go through
+      expect(document.cookie).not.toEqual(cookieStr);
+      expect(document.cookie).toEqual('x=' + longVal);
+      expect($log.warn.logs).toEqual([]);
+
+      $$cookieWriter('x', longVal + 'xxxx'); //total size 4097-4099, a warning should be logged
+      expect($log.warn.logs).toEqual(
+        [["Cookie 'x' possibly not set or overflowed because it was too large (4097 > 4096 " +
+           "bytes)!"]]);
+
+      //force browser to dropped a cookie and make sure that the cache is not out of sync
+      $$cookieWriter('x', 'shortVal');
+      expect(document.cookie).toEqual('x=shortVal'); //needed to prime the cache
+      cookieStr = document.cookie;
+      $$cookieWriter('x', longVal + longVal + longVal); //should be too long for all browsers
+
+      if (document.cookie !== cookieStr) {
+        this.fail(new Error("browser didn't drop long cookie when it was expected. make the " +
+            "cookie in this test longer"));
+      }
+
+      expect(document.cookie).toEqual('x=shortVal');
+      $log.reset();
+    }));
+  });
+
+  describe('put via $$cookieWriter(cookieName, string), if no <base href> ', function() {
+    beforeEach(inject(function($browser) {
+      $browser.$$baseHref = undefined;
+    }));
+
+    it('should default path in cookie to "" (empty string)', function() {
+      $$cookieWriter('cookie', 'bender');
+      // This only fails in Safari and IE when cookiePath returns undefined
+      // Where it now succeeds since baseHref return '' instead of undefined
+      expect(document.cookie).toEqual('cookie=bender');
+    });
+  });
+});
+
+describe('cookie options', function() {
+  var fakeDocument, $$cookieWriter;
+
+  function getLastCookieAssignment(key) {
+    return fakeDocument[0].cookie
+              .split(';')
+              .reduce(function(prev, value) {
+                var pair = value.split('=', 2);
+                if (pair[0] === key) {
+                  if (prev === undefined) {
+                    return pair[1] === undefined ? true : pair[1];
+                  } else {
+                    throw 'duplicate key in cookie string';
+                  }
+                } else {
+                  return prev;
+                }
+              }, undefined);
+  }
+
+  beforeEach(function() {
+    fakeDocument = [{cookie: ''}];
+    module('ngCookies', {$document: fakeDocument});
+    inject(function($browser) {
+      $browser.$$baseHref = '/a/b';
+    });
+    inject(function(_$$cookieWriter_) {
+      $$cookieWriter = _$$cookieWriter_;
+    });
+  });
+
+  it('should use baseHref as default path', function() {
+    $$cookieWriter('name', 'value');
+    expect(getLastCookieAssignment('path')).toBe('/a/b');
+  });
+
+  it('should accept path option', function() {
+    $$cookieWriter('name', 'value', {path: '/c/d'});
+    expect(getLastCookieAssignment('path')).toBe('/c/d');
+  });
+
+  it('should accept domain option', function() {
+    $$cookieWriter('name', 'value', {domain: '.example.com'});
+    expect(getLastCookieAssignment('domain')).toBe('.example.com');
+  });
+
+  it('should accept secure option', function() {
+    $$cookieWriter('name', 'value', {secure: true});
+    expect(getLastCookieAssignment('secure')).toBe(true);
+  });
+
+  it('should accept expires option on set', function() {
+    $$cookieWriter('name', 'value', {expires: 'Fri, 19 Dec 2014 00:00:00 GMT'});
+    expect(getLastCookieAssignment('expires')).toMatch(/^Fri, 19 Dec 2014 00:00:00 (UTC|GMT)$/);
+  });
+
+  it('should always use epoch time as expire time on remove', function() {
+    $$cookieWriter('name', undefined, {expires: 'Fri, 19 Dec 2014 00:00:00 GMT'});
+    expect(getLastCookieAssignment('expires')).toMatch(/^Thu, 0?1 Jan 1970 00:00:00 (UTC|GMT)$/);
+  });
+
+  it('should accept date object as expires option', function() {
+    $$cookieWriter('name', 'value', {expires: new Date(Date.UTC(1981, 11, 27))});
+    expect(getLastCookieAssignment('expires')).toMatch(/^Sun, 27 Dec 1981 00:00:00 (UTC|GMT)$/);
+  });
+
+});
diff --git a/test/ngCookies/cookiesSpec.js b/test/ngCookies/cookiesSpec.js
index 0a36c92f2aef..0fff36178d8b 100644
--- a/test/ngCookies/cookiesSpec.js
+++ b/test/ngCookies/cookiesSpec.js
@@ -1,149 +1,142 @@
 'use strict';
 
 describe('$cookies', function() {
-  beforeEach(module('ngCookies', function($provide) {
-    $provide.factory('$browser', function() {
-      return angular.extend(new angular.mock.$Browser(), {cookieHash: {preexisting:'oldCookie'}});
+  var mockedCookies;
+
+  beforeEach(function() {
+    mockedCookies = {};
+    module('ngCookies', {
+      $$cookieWriter: jasmine.createSpy('$$cookieWriter').andCallFake(function(name, value) {
+        mockedCookies[name] = value;
+      }),
+      $$cookieReader: function() {
+        return mockedCookies;
+      }
     });
-  }));
+  });
 
 
-  it('should provide access to existing cookies via object properties and keep them in sync',
-      inject(function($cookies, $browser, $rootScope) {
-    expect($cookies).toEqual({'preexisting': 'oldCookie'});
+  it('should serialize objects to json', inject(function($cookies) {
+    $cookies.putObject('objectCookie', {id: 123, name: 'blah'});
+    expect($cookies.get('objectCookie')).toEqual('{"id":123,"name":"blah"}');
+  }));
 
-    // access internal cookie storage of the browser mock directly to simulate behavior of
-    // document.cookie
-    $browser.cookieHash['brandNew'] = 'cookie';
-    $browser.poll();
 
-    expect($cookies).toEqual({'preexisting': 'oldCookie', 'brandNew':'cookie'});
+  it('should deserialize json to object', inject(function($cookies) {
+    $cookies.put('objectCookie', '{"id":123,"name":"blah"}');
+    expect($cookies.getObject('objectCookie')).toEqual({id: 123, name: 'blah'});
+  }));
 
-    $browser.cookieHash['brandNew'] = 'cookie2';
-    $browser.poll();
-    expect($cookies).toEqual({'preexisting': 'oldCookie', 'brandNew':'cookie2'});
 
-    delete $browser.cookieHash['brandNew'];
-    $browser.poll();
-    expect($cookies).toEqual({'preexisting': 'oldCookie'});
+  it('should delete objects from the store when remove is called', inject(function($cookies) {
+    $cookies.putObject('gonner', { "I'll":"Be Back"});
+    expect($cookies.get('gonner')).toEqual('{"I\'ll":"Be Back"}');
+    $cookies.remove('gonner');
+    expect($cookies.get('gonner')).toEqual(undefined);
   }));
 
 
-  it('should create or update a cookie when a value is assigned to a property',
-      inject(function($cookies, $browser, $rootScope) {
-    $cookies.oatmealCookie = 'nom nom';
-    $rootScope.$digest();
-
-    expect($browser.cookies()).
-      toEqual({'preexisting': 'oldCookie', 'oatmealCookie':'nom nom'});
+  it('should handle empty string value cookies', inject(function($cookies) {
+    $cookies.putObject("emptyCookie",'');
+    expect($cookies.get('emptyCookie')).toEqual('""');
+    expect($cookies.getObject("emptyCookie")).toEqual('');
+    mockedCookies['blankCookie'] = '';
+    expect($cookies.getObject("blankCookie")).toEqual('');
+  }));
 
-    $cookies.oatmealCookie = 'gone';
-    $rootScope.$digest();
 
-    expect($browser.cookies()).
-      toEqual({'preexisting': 'oldCookie', 'oatmealCookie': 'gone'});
+  it('should put cookie value without serializing', inject(function($cookies) {
+    $cookies.put('name', 'value');
+    $cookies.put('name2', '"value2"');
+    expect($cookies.get('name')).toEqual('value');
+    expect($cookies.getObject('name2')).toEqual('value2');
   }));
 
 
-  it('should convert non-string values to string',
-      inject(function($cookies, $browser, $rootScope) {
-    $cookies.nonString = [1, 2, 3];
-    $cookies.nullVal = null;
-    $cookies.undefVal = undefined;
-    var preexisting = $cookies.preexisting = function() {};
-    $rootScope.$digest();
-    expect($browser.cookies()).toEqual({
-      'preexisting': '' + preexisting,
-      'nonString': '1,2,3',
-      'nullVal': 'null',
-      'undefVal': 'undefined'
-    });
-    expect($cookies).toEqual({
-      'preexisting': '' + preexisting,
-      'nonString': '1,2,3',
-      'nullVal': 'null',
-      'undefVal': 'undefined'
-    });
+  it('should get cookie value without deserializing', inject(function($cookies) {
+    $cookies.put('name', 'value');
+    $cookies.putObject('name2', 'value2');
+    expect($cookies.get('name')).toEqual('value');
+    expect($cookies.get('name2')).toEqual('"value2"');
   }));
 
+  it('should get all the cookies', inject(function($cookies) {
+    $cookies.put('name', 'value');
+    $cookies.putObject('name2', 'value2');
+    expect($cookies.getAll()).toEqual({name: 'value', name2: '"value2"'});
+  }));
 
-  it('should remove a cookie when a $cookies property is deleted',
-      inject(function($cookies, $browser, $rootScope) {
-    $cookies.oatmealCookie = 'nom nom';
-    $rootScope.$digest();
-    $browser.poll();
-    expect($browser.cookies()).
-      toEqual({'preexisting': 'oldCookie', 'oatmealCookie':'nom nom'});
-
-    delete $cookies.oatmealCookie;
-    $rootScope.$digest();
 
-    expect($browser.cookies()).toEqual({'preexisting': 'oldCookie'});
+  it('should pass options on put', inject(function($cookies, $$cookieWriter) {
+    $cookies.put('name', 'value', {path: '/a/b'});
+    expect($$cookieWriter).toHaveBeenCalledWith('name', 'value', {path: '/a/b'});
   }));
 
 
-  it('should drop or reset cookies that browser refused to store',
-      inject(function($cookies, $browser, $rootScope) {
-    var i, longVal;
+  it('should pass options on putObject', inject(function($cookies, $$cookieWriter) {
+    $cookies.putObject('name', 'value', {path: '/a/b'});
+    expect($$cookieWriter).toHaveBeenCalledWith('name', '"value"', {path: '/a/b'});
+  }));
 
-    for (i = 0; i < 5000; i++) {
-      longVal += '*';
-    }
 
-    //drop if no previous value
-    $cookies.longCookie = longVal;
-    $rootScope.$digest();
-    expect($cookies).toEqual({'preexisting': 'oldCookie'});
+  it('should pass options on remove', inject(function($cookies, $$cookieWriter) {
+    $cookies.remove('name', {path: '/a/b'});
+    expect($$cookieWriter).toHaveBeenCalledWith('name', undefined, {path: '/a/b'});
+  }));
 
 
-    //reset if previous value existed
-    $cookies.longCookie = 'shortVal';
-    $rootScope.$digest();
-    expect($cookies).toEqual({'preexisting': 'oldCookie', 'longCookie': 'shortVal'});
-    $cookies.longCookie = longVal;
-    $rootScope.$digest();
-    expect($cookies).toEqual({'preexisting': 'oldCookie', 'longCookie': 'shortVal'});
-  }));
-});
+  it('should pass default options on put', function() {
+    module(function($cookiesProvider) {
+      $cookiesProvider.defaults.secure = true;
+    });
+    inject(function($cookies, $$cookieWriter) {
+      $cookies.put('name', 'value', {path: '/a/b'});
+      expect($$cookieWriter).toHaveBeenCalledWith('name', 'value', {path: '/a/b', secure: true});
+    });
+  });
 
 
-describe('$cookieStore', function() {
+  it('should pass default options on putObject', function() {
+    module(function($cookiesProvider) {
+      $cookiesProvider.defaults.secure = true;
+    });
+    inject(function($cookies, $$cookieWriter) {
+      $cookies.putObject('name', 'value', {path: '/a/b'});
+      expect($$cookieWriter).toHaveBeenCalledWith('name', '"value"', {path: '/a/b', secure: true});
+    });
+  });
 
-  beforeEach(module('ngCookies'));
 
-  it('should serialize objects to json', inject(function($cookieStore, $browser, $rootScope) {
-    $cookieStore.put('objectCookie', {id: 123, name: 'blah'});
-    $rootScope.$digest();
-    expect($browser.cookies()).toEqual({'objectCookie': '{"id":123,"name":"blah"}'});
-  }));
+  it('should pass default options on remove', function() {
+    module(function($cookiesProvider) {
+      $cookiesProvider.defaults.secure = true;
+    });
+    inject(function($cookies, $$cookieWriter) {
+      $cookies.remove('name', {path: '/a/b'});
+      expect($$cookieWriter).toHaveBeenCalledWith('name', undefined, {path: '/a/b', secure: true});
+    });
+  });
 
 
-  it('should deserialize json to object', inject(function($cookieStore, $browser) {
-    $browser.cookies('objectCookie', '{"id":123,"name":"blah"}');
-    $browser.poll();
-    expect($cookieStore.get('objectCookie')).toEqual({id: 123, name: 'blah'});
-  }));
+  it('should let passed options override default options', function() {
+    module(function($cookiesProvider) {
+      $cookiesProvider.defaults.secure = true;
+    });
+    inject(function($cookies, $$cookieWriter) {
+      $cookies.put('name', 'value', {secure: false});
+      expect($$cookieWriter).toHaveBeenCalledWith('name', 'value', {secure: false});
+    });
+  });
 
 
-  it('should delete objects from the store when remove is called', inject(function($cookieStore, $browser, $rootScope) {
-    $cookieStore.put('gonner', { "I'll":"Be Back"});
-    $rootScope.$digest(); //force eval in test
-    $browser.poll();
-    expect($browser.cookies()).toEqual({'gonner': '{"I\'ll":"Be Back"}'});
+  it('should pass default options if no options are passed', function() {
+    module(function($cookiesProvider) {
+      $cookiesProvider.defaults.secure = true;
+    });
+    inject(function($cookies, $$cookieWriter) {
+      $cookies.put('name', 'value');
+      expect($$cookieWriter).toHaveBeenCalledWith('name', 'value', {secure: true});
+    });
+  });
 
-    $cookieStore.remove('gonner');
-    $rootScope.$digest();
-    expect($browser.cookies()).toEqual({});
-  }));
-  it('should handle empty string value cookies', inject(function($cookieStore, $browser, $rootScope) {
-    $cookieStore.put("emptyCookie",'');
-    $rootScope.$digest();
-    expect($browser.cookies()).
-        toEqual({ 'emptyCookie': '""' });
-    expect($cookieStore.get("emptyCookie")).toEqual('');
-
-    $browser.cookieHash['blankCookie'] = '';
-    $browser.poll();
-    expect($cookieStore.get("blankCookie")).toEqual('');
-  }));
-});
+ });
diff --git a/test/ngMessageFormat/messageFormatSpec.js b/test/ngMessageFormat/messageFormatSpec.js
new file mode 100644
index 000000000000..d8bda839975f
--- /dev/null
+++ b/test/ngMessageFormat/messageFormatSpec.js
@@ -0,0 +1,707 @@
+'use strict';
+
+/* TODO: Add tests for:
+ • Whitespace preservation in messages.
+ • Whitespace ignored around syntax except for offset:N.
+ • Escaping for curlies and the # symbol.
+ • # symbol value.
+ • # symbol value when gender is nested inside plural.
+ • Error with nested # symbol.
+ • parser error messages.
+ • caching.
+ • watched expressions.
+ • test parsing angular expressions
+ • test the different regexes
+ • test the different starting rules
+*/
+
+describe('$$ngMessageFormat', function() {
+  describe('core', function() {
+    var $$messageFormat, $parse, $interpolate, $locale, $rootScope;
+
+    function Person(name, gender) {
+      this.name = name;
+      this.gender = gender;
+    }
+
+    var alice   = new Person("Alice", "female"),
+        bob     = new Person("Bob", "male"),
+        charlie = new Person("Charlie", "male"),
+        harry   = new Person("Harry Potter", "male");
+
+    function initScope($scope) {
+      $scope.recipients = [alice, bob, charlie];
+      $scope.sender = harry;
+    }
+
+    beforeEach(module('ngMessageFormat'));
+
+    beforeEach(function() {
+      inject(['$$messageFormat', '$parse', '$locale', '$interpolate', '$rootScope', function(
+                 messageFormat,    parse,    locale,    interpolate,    rootScope) {
+        $$messageFormat = messageFormat;
+        $parse = parse;
+        $interpolate = interpolate;
+        $locale = locale;
+        $rootScope = rootScope;
+        initScope(rootScope);
+      }]);
+    });
+
+    describe('mustache', function() {
+      function assertMustache(text, expected) {
+        var parsedFn = $interpolate(text);
+        expect(parsedFn($rootScope)).toEqual(expected);
+      }
+
+      it('should suppress falsy objects', function() {
+        assertMustache("{{undefined}}", "");
+        assertMustache("{{null}}", "");
+        assertMustache("{{a.b}}", "");
+      });
+
+      it('should jsonify objects', function() {
+        assertMustache("{{ {} }}", "{}");
+        assertMustache("{{ true }}", "true");
+        assertMustache("{{ false }}", "false");
+        assertMustache("{{ 1 }}", "1");
+        assertMustache("{{ '1' }}", "1");
+        assertMustache("{{ sender }}", '{"name":"Harry Potter","gender":"male"}');
+      });
+
+      it('should return function that can be called with no context', inject(function($interpolate) {
+        expect($interpolate("{{sender.name}}")()).toEqual("");
+      }));
+
+      describe('watchable', function() {
+        it('ckck', function() {
+          var calls = [];
+          $rootScope.$watch($interpolate("{{::name}}"), function(val) {
+            calls.push(val);
+          });
+
+          $rootScope.$apply();
+          expect(calls.length).toBe(1);
+
+          $rootScope.name = "foo";
+          $rootScope.$apply();
+          expect(calls.length).toBe(2);
+          expect(calls[1]).toBe('foo');
+
+          $rootScope.name = "bar";
+          $rootScope.$apply();
+          expect(calls.length).toBe(2);
+        });
+
+
+        it('should stop watching strings with no expressions after first execution', function() {
+          var spy = jasmine.createSpy();
+          $rootScope.$watch($$messageFormat.interpolate('foo'), spy);
+          $rootScope.$digest();
+          expect($rootScope.$countWatchers()).toBe(0);
+          expect(spy).toHaveBeenCalledWith('foo', 'foo', $rootScope);
+          expect(spy.calls.length).toBe(1);
+        });
+
+        it('should stop watching strings with only constant expressions after first execution', function() {
+          var spy = jasmine.createSpy();
+          $rootScope.$watch($$messageFormat.interpolate('foo {{42}}'), spy);
+          $rootScope.$digest();
+          expect($rootScope.$countWatchers()).toBe(0);
+          expect(spy).toHaveBeenCalledWith('foo 42', 'foo 42', $rootScope);
+          expect(spy.calls.length).toBe(1);
+        });
+
+
+      });
+
+      describe('plural', function() {
+        it('no interpolation', function() {
+          var text = "" +
+            "{{recipients.length, plural,\n" +
+            "    =0    {You gave no gifts}\n" +
+            "    =1    {You gave one person a gift}\n" +
+            // "=1" should override "one" for exact value.
+            "    one   {YOU SHOULD NEVER SEE THIS MESSAGE}\n" +
+            "    other {You gave some people gifts}\n" +
+            "}}";
+          var parsedFn = $interpolate(text, /*mustHaveExpression=*/true);
+          expect(parsedFn.expressions.length).toBe(1);
+          expect(parsedFn.expressions[0]).toEqual("recipients.length");
+
+          $rootScope.recipients.length=2;
+          expect(parsedFn($rootScope)).toEqual("You gave some people gifts");
+
+          $rootScope.recipients.length=1;
+          expect(parsedFn($rootScope)).toEqual("You gave one person a gift");
+
+          $rootScope.recipients.length=0;
+          expect(parsedFn($rootScope)).toEqual("You gave no gifts");
+        });
+
+        it('with interpolation', function() {
+          var text = "" +
+            "{{recipients.length, plural,\n" +
+            "    =0    {{{sender.name}} gave no gifts}\n" +
+            "    =1    {{{sender.name}} gave one gift to {{recipients[0].name}}}\n" +
+            // "=1" should override "one" for exact value.
+            "    one   {YOU SHOULD NEVER SEE THIS MESSAGE}\n" +
+            "    other {{{sender.name}} gave them a gift}\n" +
+            "}}";
+          var parsedFn = $interpolate(text, /*mustHaveExpression=*/true);
+          expect(parsedFn.expressions.length).toBe(1);
+          expect(parsedFn.expressions[0]).toEqual("recipients.length");
+
+          $rootScope.recipients.length=2;
+          expect(parsedFn($rootScope)).toEqual("Harry Potter gave them a gift");
+
+          $rootScope.recipients.length=1;
+          expect(parsedFn($rootScope)).toEqual("Harry Potter gave one gift to Alice");
+
+          $rootScope.recipients.length=0;
+          expect(parsedFn($rootScope)).toEqual("Harry Potter gave no gifts");
+        });
+
+        it('with offset, interpolation, "#" symbol with and without escaping', function() {
+          var text = "" +
+            "{{recipients.length, plural, offset:1\n" +
+            // NOTE: It's nonsensical to use "#" for "=0" with a positive offset.
+            "    =0    {{{sender.name}} gave no gifts (\\#=#)}\n" +
+            "    =1    {{{sender.name}} gave one gift to {{recipients[0].name}} (\\#=#)}\n" +
+            "    one   {{{sender.name}} gave {{recipients[0].name}} and one other person a gift (\\#=#)}\n" +
+            "    other {{{sender.name}} gave {{recipients[0].name}} and # other people a gift (\\#=#)}\n" +
+            "}}";
+          var parsedFn = $interpolate(text, /*mustHaveExpression=*/true);
+          expect(parsedFn.expressions.length).toBe(1);
+          expect(parsedFn.expressions[0]).toEqual("recipients.length");
+
+          $rootScope.recipients.length=3;
+          // "#" should get replaced with the value of "recipients.length - offset"
+          expect(parsedFn($rootScope)).toEqual("Harry Potter gave Alice and 2 other people a gift (#=2)");
+
+          $rootScope.recipients.length=2;
+          expect(parsedFn($rootScope)).toEqual("Harry Potter gave Alice and one other person a gift (#=1)");
+
+          $rootScope.recipients.length=1;
+          expect(parsedFn($rootScope)).toEqual("Harry Potter gave one gift to Alice (#=0)");
+
+          $rootScope.recipients.length=0;
+          expect(parsedFn($rootScope)).toEqual("Harry Potter gave no gifts (#=-1)");
+        });
+      });
+
+      it('nested plural and select', function() {
+        var text = "" +
+          "{{recipients.length, plural,\n" +
+          "    =0 {You gave no gifts}\n" +
+          "    =1 {{{recipients[0].gender, select,\n" +
+          "            male {You gave him a gift. -{{sender.name}}}\n" +
+          "            female {You gave her a gift. -{{sender.name}}}\n" +
+          "            other {You gave them a gift. -{{sender.name}}}\n" +
+          "        }}\n" +
+          "       }\n" +
+          "    other {You gave {{recipients.length}} people gifts. -{{sender.name}}}\n" +
+          "}}";
+        var parsedFn = $interpolate(text, /*mustHaveExpression=*/true);
+        expect(parsedFn.expressions.length).toBe(1);
+        expect(parsedFn.expressions[0]).toEqual("recipients.length");
+        var result = parsedFn($rootScope);
+        expect(result).toEqual("You gave 3 people gifts. -Harry Potter");
+      });
+    });
+
+    describe('interpolate', function() {
+      function assertInterpolation(text, expected) {
+        var parsedFn = $$messageFormat.interpolate(text);
+        expect(parsedFn($rootScope)).toEqual(expected);
+      }
+
+      it('should interpolate a plain string', function() {
+        assertInterpolation(" Hello, world! ", " Hello, world! ");
+      });
+
+      it('should interpolate a simple expression', function() {
+        assertInterpolation("Hello, {{sender.name}}!", "Hello, Harry Potter!");
+      });
+    });
+  });
+
+
+  /* NOTE: This describe block includes a copy of interpolateSpec.js to test that
+   *       $$messageFormat.interpolate behaves the same as $interpolate.
+   *       ONLY the following changes have been made.
+   *       - Add beforeEach(module('ngMessageFormat')) at top level of describe()
+   *       - Add extra "}" for it('should not unescape markers within expressions'). Original
+   *         $interpolate has a bug/feature where a "}}" inside a string is also treated as a
+   *         closing symbol.  The new service understands the string context and fixes this.
+   *       - All tests for startSymbol/endSymbol have been commented out.  The new service does not
+   *         allow you to change them as of now.
+   *       - Instead, I've added tests to assert that we throw an exception if used with redefined
+   *         startSymbol/endSymbol.  These tests are listed right in the beginning before the
+   *         others.  allow you to change them as of now.
+   */
+  describe('$interpolate', function() {
+    beforeEach(module('ngMessageFormat'));
+
+    describe('startSymbol', function() {
+      it('should expose the startSymbol in run phase', inject(function($interpolate) {
+        expect($interpolate.startSymbol()).toBe('{{');
+      }));
+      describe('redefinition', function() {
+        beforeEach(module(function($interpolateProvider) {
+          expect($interpolateProvider.startSymbol()).toBe('{{');
+          $interpolateProvider.startSymbol('((');
+        }));
+        it('should not work when the startSymbol is redefined', function() {
+          expect(function() {
+            inject(inject(function($interpolate) {}));
+          }).toThrowMinErr('$interpolate', 'nochgmustache');
+        });
+      });
+    });
+
+    describe('endSymbol', function() {
+      it('should expose the endSymbol in run phase', inject(function($interpolate) {
+        expect($interpolate.endSymbol()).toBe('}}');
+      }));
+      describe('redefinition', function() {
+        beforeEach(module(function($interpolateProvider) {
+          expect($interpolateProvider.endSymbol()).toBe('}}');
+          $interpolateProvider.endSymbol('))');
+        }));
+        it('should not work when the endSymbol is redefined', function() {
+          expect(function() {
+            inject(inject(function($interpolate) {}));
+          }).toThrowMinErr('$interpolate', 'nochgmustache');
+        });
+      });
+    });
+
+    it('should return the interpolation object when there are no bindings and textOnly is undefined',
+        inject(function($interpolate) {
+      var interpolateFn = $interpolate('some text');
+
+      expect(interpolateFn.exp).toBe('some text');
+      expect(interpolateFn.expressions).toEqual([]);
+
+      expect(interpolateFn({})).toBe('some text');
+    }));
+
+
+    it('should return undefined when there are no bindings and textOnly is set to true',
+        inject(function($interpolate) {
+      expect($interpolate('some text', true)).toBeUndefined();
+    }));
+
+    it('should return undefined when there are bindings and strict is set to true',
+        inject(function($interpolate) {
+      expect($interpolate('test {{foo}}', false, null, true)({})).toBeUndefined();
+    }));
+
+    it('should suppress falsy objects', inject(function($interpolate) {
+      expect($interpolate('{{undefined}}')({})).toEqual('');
+      expect($interpolate('{{null}}')({})).toEqual('');
+      expect($interpolate('{{a.b}}')({})).toEqual('');
+    }));
+
+    it('should jsonify objects', inject(function($interpolate) {
+      expect($interpolate('{{ {} }}')({})).toEqual('{}');
+      expect($interpolate('{{ true }}')({})).toEqual('true');
+      expect($interpolate('{{ false }}')({})).toEqual('false');
+    }));
+
+
+    it('should return interpolation function', inject(function($interpolate, $rootScope) {
+      var interpolateFn = $interpolate('Hello {{name}}!');
+
+      expect(interpolateFn.exp).toBe('Hello {{name}}!');
+      expect(interpolateFn.expressions).toEqual(['name']);
+
+      var scope = $rootScope.$new();
+      scope.name = 'Bubu';
+
+      expect(interpolateFn(scope)).toBe('Hello Bubu!');
+    }));
+
+
+    it('should ignore undefined model', inject(function($interpolate) {
+      expect($interpolate("Hello {{'World'}}{{foo}}")({})).toBe('Hello World');
+    }));
+
+
+    it('should interpolate with undefined context', inject(function($interpolate) {
+      expect($interpolate("Hello, world!{{bloop}}")()).toBe("Hello, world!");
+    }));
+
+    describe('watching', function() {
+      it('should be watchable with any input types', inject(function($interpolate, $rootScope) {
+        var lastVal;
+        $rootScope.$watch($interpolate('{{i}}'), function(val) {
+          lastVal = val;
+        });
+        $rootScope.$apply();
+        expect(lastVal).toBe('');
+
+        $rootScope.i = null;
+        $rootScope.$apply();
+        expect(lastVal).toBe('');
+
+        $rootScope.i = '';
+        $rootScope.$apply();
+        expect(lastVal).toBe('');
+
+        $rootScope.i = 0;
+        $rootScope.$apply();
+        expect(lastVal).toBe('0');
+
+        $rootScope.i = [0];
+        $rootScope.$apply();
+        expect(lastVal).toBe('[0]');
+
+        $rootScope.i = {a: 1, b: 2};
+        $rootScope.$apply();
+        expect(lastVal).toBe('{"a":1,"b":2}');
+      }));
+
+      it('should be watchable with literal values', inject(function($interpolate, $rootScope) {
+        var lastVal;
+        $rootScope.$watch($interpolate('{{1}}{{"2"}}{{true}}{{[false]}}{{ {a: 2} }}'), function(val) {
+          lastVal = val;
+        });
+        $rootScope.$apply();
+        expect(lastVal).toBe('12true[false]{"a":2}');
+
+        expect($rootScope.$countWatchers()).toBe(0);
+      }));
+
+      it('should respect one-time bindings for each individual expression', inject(function($interpolate, $rootScope) {
+        var calls = [];
+        $rootScope.$watch($interpolate('{{::a | limitTo:1}} {{::s}} {{::i | number}}'), function(val) {
+          calls.push(val);
+        });
+
+        $rootScope.$apply();
+        expect(calls.length).toBe(1);
+
+        $rootScope.a = [1];
+        $rootScope.$apply();
+        expect(calls.length).toBe(2);
+        expect(calls[1]).toBe('[1]  ');
+
+        $rootScope.a = [0];
+        $rootScope.$apply();
+        expect(calls.length).toBe(2);
+
+        $rootScope.i = $rootScope.a = 123;
+        $rootScope.s = 'str!';
+        $rootScope.$apply();
+        expect(calls.length).toBe(3);
+        expect(calls[2]).toBe('[1] str! 123');
+
+        expect($rootScope.$countWatchers()).toBe(0);
+      }));
+
+      it('should stop watching strings with no expressions after first execution',
+        inject(function($interpolate, $rootScope) {
+          var spy = jasmine.createSpy();
+          $rootScope.$watch($interpolate('foo'), spy);
+          $rootScope.$digest();
+          expect($rootScope.$countWatchers()).toBe(0);
+          expect(spy).toHaveBeenCalledWith('foo', 'foo', $rootScope);
+          expect(spy.calls.length).toBe(1);
+        })
+      );
+
+      it('should stop watching strings with only constant expressions after first execution',
+        inject(function($interpolate, $rootScope) {
+          var spy = jasmine.createSpy();
+          $rootScope.$watch($interpolate('foo {{42}}'), spy);
+          $rootScope.$digest();
+          expect($rootScope.$countWatchers()).toBe(0);
+          expect(spy).toHaveBeenCalledWith('foo 42', 'foo 42', $rootScope);
+          expect(spy.calls.length).toBe(1);
+        })
+      );
+    });
+
+    describe('interpolation escaping', function() {
+      var obj;
+      beforeEach(function() {
+        obj = {foo: 'Hello', bar: 'World'};
+      });
+
+
+      it('should support escaping interpolation signs', inject(function($interpolate) {
+        expect($interpolate('{{foo}} \\{\\{bar\\}\\}')(obj)).toBe('Hello {{bar}}');
+        expect($interpolate('\\{\\{foo\\}\\} {{bar}}')(obj)).toBe('{{foo}} World');
+      }));
+
+
+      it('should unescape multiple expressions', inject(function($interpolate) {
+        expect($interpolate('\\{\\{foo\\}\\}\\{\\{bar\\}\\} {{foo}}')(obj)).toBe('{{foo}}{{bar}} Hello');
+        expect($interpolate('{{foo}}\\{\\{foo\\}\\}\\{\\{bar\\}\\}')(obj)).toBe('Hello{{foo}}{{bar}}');
+        expect($interpolate('\\{\\{foo\\}\\}{{foo}}\\{\\{bar\\}\\}')(obj)).toBe('{{foo}}Hello{{bar}}');
+        expect($interpolate('{{foo}}\\{\\{foo\\}\\}{{bar}}\\{\\{bar\\}\\}{{foo}}')(obj)).toBe('Hello{{foo}}World{{bar}}Hello');
+      }));
+
+
+      /*
+       *it('should support escaping custom interpolation start/end symbols', function() {
+       *  module(function($interpolateProvider) {
+       *    $interpolateProvider.startSymbol('[[');
+       *    $interpolateProvider.endSymbol(']]');
+       *  });
+       *  inject(function($interpolate) {
+       *    expect($interpolate('[[foo]] \\[\\[bar\\]\\]')(obj)).toBe('Hello [[bar]]');
+       *  });
+       *});
+       */
+
+
+      it('should unescape incomplete escaped expressions', inject(function($interpolate) {
+        expect($interpolate('\\{\\{foo{{foo}}')(obj)).toBe('{{fooHello');
+        expect($interpolate('\\}\\}foo{{foo}}')(obj)).toBe('}}fooHello');
+        expect($interpolate('foo{{foo}}\\{\\{')(obj)).toBe('fooHello{{');
+        expect($interpolate('foo{{foo}}\\}\\}')(obj)).toBe('fooHello}}');
+      }));
+
+
+      it('should not unescape markers within expressions', inject(function($interpolate) {
+        expect($interpolate('{{"\\\\{\\\\{Hello, world!\\\\}\\\\}"}}')(obj)).toBe('\\{\\{Hello, world!\\}\\}');
+        expect($interpolate('{{"\\{\\{Hello, world!\\}\\}"}}')(obj)).toBe('{{Hello, world!}}');
+        expect(function() {
+          $interpolate('{{\\{\\{foo\\}\\}}}')(obj);
+        }).toThrowMinErr('$parse', 'lexerr',
+          'Lexer Error: Unexpected next character  at columns 0-0 [\\] in expression [\\{\\{foo\\}\\}]');
+      }));
+
+
+      // This test demonstrates that the web-server is responsible for escaping every single instance
+      // of interpolation start/end markers in an expression which they do not wish to evaluate,
+      // because AngularJS will not protect them from being evaluated (due to the added complexity
+      // and maintenance burden of context-sensitive escaping)
+      it('should evaluate expressions between escaped start/end symbols', inject(function($interpolate) {
+        expect($interpolate('\\{\\{Hello, {{bar}}!\\}\\}')(obj)).toBe('{{Hello, World!}}');
+      }));
+    });
+
+
+    describe('interpolating in a trusted context', function() {
+      var sce;
+      beforeEach(function() {
+        function log() {}
+        var fakeLog = {log: log, warn: log, info: log, error: log};
+        module(function($provide, $sceProvider) {
+          $provide.value('$log', fakeLog);
+          $sceProvider.enabled(true);
+        });
+        inject(['$sce', function($sce) { sce = $sce; }]);
+      });
+
+      it('should NOT interpolate non-trusted expressions', inject(function($interpolate, $rootScope) {
+        var scope = $rootScope.$new();
+        scope.foo = "foo";
+
+        expect(function() {
+          $interpolate('{{foo}}', true, sce.CSS)(scope);
+        }).toThrowMinErr('$interpolate', 'interr');
+      }));
+
+      it('should NOT interpolate mistyped expressions', inject(function($interpolate, $rootScope) {
+        var scope = $rootScope.$new();
+        scope.foo = sce.trustAsCss("foo");
+
+        expect(function() {
+          $interpolate('{{foo}}', true, sce.HTML)(scope);
+        }).toThrowMinErr('$interpolate', 'interr');
+      }));
+
+      it('should interpolate trusted expressions in a regular context', inject(function($interpolate) {
+        var foo = sce.trustAsCss("foo");
+        expect($interpolate('{{foo}}', true)({foo: foo})).toBe('foo');
+      }));
+
+      it('should interpolate trusted expressions in a specific trustedContext', inject(function($interpolate) {
+        var foo = sce.trustAsCss("foo");
+        expect($interpolate('{{foo}}', true, sce.CSS)({foo: foo})).toBe('foo');
+      }));
+
+      // The concatenation of trusted values does not necessarily result in a trusted value.  (For
+      // instance, you can construct evil JS code by putting together pieces of JS strings that are by
+      // themselves safe to execute in isolation.)
+      it('should NOT interpolate trusted expressions with multiple parts', inject(function($interpolate) {
+        var foo = sce.trustAsCss("foo");
+        var bar = sce.trustAsCss("bar");
+        expect(function() {
+          return $interpolate('{{foo}}{{bar}}', true, sce.CSS)({foo: foo, bar: bar});
+        }).toThrowMinErr(
+                  "$interpolate", "noconcat", "Error while interpolating: {{foo}}{{bar}}\n" +
+                  "Strict Contextual Escaping disallows interpolations that concatenate multiple " +
+                  "expressions when a trusted value is required.  See " +
+                  "http://docs.angularjs.org/api/ng.$sce");
+      }));
+    });
+
+
+/*
+ *    describe('provider', function() {
+ *      beforeEach(module(function($interpolateProvider) {
+ *        $interpolateProvider.startSymbol('--');
+ *        $interpolateProvider.endSymbol('--');
+ *      }));
+ *
+ *      it('should not get confused with same markers', inject(function($interpolate) {
+ *        expect($interpolate('---').expressions).toEqual([]);
+ *        expect($interpolate('----')({})).toEqual('');
+ *        expect($interpolate('--1--')({})).toEqual('1');
+ *      }));
+ *    });
+ */
+
+    describe('parseBindings', function() {
+      it('should Parse Text With No Bindings', inject(function($interpolate) {
+        expect($interpolate("a").expressions).toEqual([]);
+      }));
+
+      it('should Parse Empty Text', inject(function($interpolate) {
+        expect($interpolate("").expressions).toEqual([]);
+      }));
+
+      it('should Parse Inner Binding', inject(function($interpolate) {
+        var interpolateFn = $interpolate("a{{b}}C"),
+            expressions = interpolateFn.expressions;
+        expect(expressions).toEqual(['b']);
+        expect(interpolateFn({b: 123})).toEqual('a123C');
+      }));
+
+      it('should Parse Ending Binding', inject(function($interpolate) {
+        var interpolateFn = $interpolate("a{{b}}"),
+          expressions = interpolateFn.expressions;
+        expect(expressions).toEqual(['b']);
+        expect(interpolateFn({b: 123})).toEqual('a123');
+      }));
+
+      it('should Parse Begging Binding', inject(function($interpolate) {
+        var interpolateFn = $interpolate("{{b}}c"),
+          expressions = interpolateFn.expressions;
+        expect(expressions).toEqual(['b']);
+        expect(interpolateFn({b: 123})).toEqual('123c');
+      }));
+
+      it('should Parse Loan Binding', inject(function($interpolate) {
+        var interpolateFn = $interpolate("{{b}}"),
+          expressions = interpolateFn.expressions;
+        expect(expressions).toEqual(['b']);
+        expect(interpolateFn({b: 123})).toEqual('123');
+      }));
+
+      it('should Parse Two Bindings', inject(function($interpolate) {
+        var interpolateFn = $interpolate("{{b}}{{c}}"),
+          expressions = interpolateFn.expressions;
+        expect(expressions).toEqual(['b', 'c']);
+        expect(interpolateFn({b: 111, c: 222})).toEqual('111222');
+      }));
+
+      it('should Parse Two Bindings With Text In Middle', inject(function($interpolate) {
+        var interpolateFn = $interpolate("{{b}}x{{c}}"),
+          expressions = interpolateFn.expressions;
+        expect(expressions).toEqual(['b', 'c']);
+        expect(interpolateFn({b: 111, c: 222})).toEqual('111x222');
+      }));
+
+      it('should Parse Multiline', inject(function($interpolate) {
+        var interpolateFn = $interpolate('"X\nY{{A\n+B}}C\nD"'),
+          expressions = interpolateFn.expressions;
+        expect(expressions).toEqual(['A\n+B']);
+        expect(interpolateFn({'A': 'aa', 'B': 'bb'})).toEqual('"X\nYaabbC\nD"');
+      }));
+    });
+
+
+    describe('isTrustedContext', function() {
+      it('should NOT interpolate a multi-part expression when isTrustedContext is true', inject(function($interpolate) {
+        var isTrustedContext = true;
+        expect(function() {
+            $interpolate('constant/{{var}}', true, isTrustedContext);
+          }).toThrowMinErr(
+              "$interpolate", "noconcat", "Error while interpolating: constant/{{var}}\nStrict " +
+              "Contextual Escaping disallows interpolations that concatenate multiple expressions " +
+              "when a trusted value is required.  See http://docs.angularjs.org/api/ng.$sce");
+        expect(function() {
+          $interpolate('{{var}}/constant', true, isTrustedContext);
+        }).toThrowMinErr(
+            "$interpolate", "noconcat", "Error while interpolating: {{var}}/constant\nStrict " +
+              "Contextual Escaping disallows interpolations that concatenate multiple expressions " +
+              "when a trusted value is required.  See http://docs.angularjs.org/api/ng.$sce");
+        expect(function() {
+            $interpolate('{{foo}}{{bar}}', true, isTrustedContext);
+          }).toThrowMinErr(
+              "$interpolate", "noconcat", "Error while interpolating: {{foo}}{{bar}}\nStrict " +
+              "Contextual Escaping disallows interpolations that concatenate multiple expressions " +
+              "when a trusted value is required.  See http://docs.angularjs.org/api/ng.$sce");
+      }));
+
+      it('should interpolate a multi-part expression when isTrustedContext is false', inject(function($interpolate) {
+        expect($interpolate('some/{{id}}')({})).toEqual('some/');
+        expect($interpolate('some/{{id}}')({id: 1})).toEqual('some/1');
+        expect($interpolate('{{foo}}{{bar}}')({foo: 1, bar: 2})).toEqual('12');
+      }));
+    });
+
+/*
+ *    describe('startSymbol', function() {
+ *
+ *      beforeEach(module(function($interpolateProvider) {
+ *        expect($interpolateProvider.startSymbol()).toBe('{{');
+ *        $interpolateProvider.startSymbol('((');
+ *      }));
+ *
+ *
+ *      it('should expose the startSymbol in config phase', module(function($interpolateProvider) {
+ *        expect($interpolateProvider.startSymbol()).toBe('((');
+ *      }));
+ *
+ *
+ *      it('should expose the startSymbol in run phase', inject(function($interpolate) {
+ *        expect($interpolate.startSymbol()).toBe('((');
+ *      }));
+ *
+ *
+ *      it('should not get confused by matching start and end symbols', function() {
+ *        module(function($interpolateProvider) {
+ *          $interpolateProvider.startSymbol('--');
+ *          $interpolateProvider.endSymbol('--');
+ *        });
+ *
+ *        inject(function($interpolate) {
+ *          expect($interpolate('---').expressions).toEqual([]);
+ *          expect($interpolate('----')({})).toEqual('');
+ *          expect($interpolate('--1--')({})).toEqual('1');
+ *        });
+ *      });
+ *    });
+ */
+
+
+/*
+ *    describe('endSymbol', function() {
+ *
+ *      beforeEach(module(function($interpolateProvider) {
+ *        expect($interpolateProvider.endSymbol()).toBe('}}');
+ *        $interpolateProvider.endSymbol('))');
+ *      }));
+ *
+ *
+ *      it('should expose the endSymbol in config phase', module(function($interpolateProvider) {
+ *        expect($interpolateProvider.endSymbol()).toBe('))');
+ *      }));
+ *
+ *
+ *      it('should expose the endSymbol in run phase', inject(function($interpolate) {
+ *        expect($interpolate.endSymbol()).toBe('))');
+ *      }));
+ *    });
+ */
+
+  });  // end of tests copied from $interpolate
+});
diff --git a/test/ngMessages/messagesSpec.js b/test/ngMessages/messagesSpec.js
index a0b39ddf8570..037175031ded 100644
--- a/test/ngMessages/messagesSpec.js
+++ b/test/ngMessages/messagesSpec.js
@@ -4,17 +4,8 @@ describe('ngMessages', function() {
   beforeEach(inject.strictDi());
   beforeEach(module('ngMessages'));
 
-  function they(msg, vals, spec, focus) {
-    forEach(vals, function(val, key) {
-      var m = msg.replace('$prop', key);
-      (focus ? iit : it)(m, function() {
-        spec(val);
-      });
-    });
-  }
-
-  function tthey(msg, vals, spec) {
-    they(msg, vals, spec, true);
+  function messageChildren(element) {
+    return (element.length ? element[0] : element).querySelectorAll('[ng-message], [ng-message-exp]');
   }
 
   function s(str) {
@@ -41,7 +32,40 @@ describe('ngMessages', function() {
     expect(element.text()).toContain('Message is set');
   }));
 
-  it('should use the data attribute when an element directive is used',
+  it('should render the same message if multiple message keys match', inject(function($rootScope, $compile) {
+    element = $compile('<div ng-messages="col">' +
+                       '  <div ng-message="one, two, three">Message is set</div>' +
+                       '</div>')($rootScope);
+    $rootScope.$digest();
+
+    expect(element.text()).not.toContain('Message is set');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { one: true };
+    });
+
+    expect(element.text()).toContain('Message is set');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { two: true, one: false };
+    });
+
+    expect(element.text()).toContain('Message is set');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { three: true, two: false };
+    });
+
+    expect(element.text()).toContain('Message is set');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { three: false };
+    });
+
+    expect(element.text()).not.toContain('Message is set');
+  }));
+
+  it('should use the when attribute when an element directive is used',
     inject(function($rootScope, $compile) {
 
     element = $compile('<ng-messages for="col">' +
@@ -58,6 +82,111 @@ describe('ngMessages', function() {
     expect(element.text()).toContain('Message is set');
   }));
 
+  it('should render the same message if multiple message keys match based on the when attribute', inject(function($rootScope, $compile) {
+    element = $compile('<ng-messages for="col">' +
+                       '  <ng-message when=" one two three ">Message is set</div>' +
+                       '</ng-messages>')($rootScope);
+    $rootScope.$digest();
+
+    expect(element.text()).not.toContain('Message is set');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { one: true };
+    });
+
+    expect(element.text()).toContain('Message is set');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { two: true, one: false };
+    });
+
+    expect(element.text()).toContain('Message is set');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { three: true, two: false };
+    });
+
+    expect(element.text()).toContain('Message is set');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { three: false };
+    });
+
+    expect(element.text()).not.toContain('Message is set');
+  }));
+
+  it('should allow a dynamic expression to be set when ng-message-exp is used',
+    inject(function($rootScope, $compile) {
+
+    element = $compile('<div ng-messages="col">' +
+                       '  <div ng-message-exp="variable">Message is crazy</div>' +
+                       '</div>')($rootScope);
+    $rootScope.$digest();
+
+    expect(element.text()).not.toContain('Message is crazy');
+
+    $rootScope.$apply(function() {
+      $rootScope.variable = 'error';
+      $rootScope.col = { error: true };
+    });
+
+    expect(element.text()).toContain('Message is crazy');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { error: false, failure: true };
+    });
+
+    expect(element.text()).not.toContain('Message is crazy');
+
+    $rootScope.$apply(function() {
+      $rootScope.variable = ['failure'];
+    });
+
+    expect(element.text()).toContain('Message is crazy');
+
+    $rootScope.$apply(function() {
+      $rootScope.variable = null;
+    });
+
+    expect(element.text()).not.toContain('Message is crazy');
+  }));
+
+  it('should allow a dynamic expression to be set when the when-exp attribute is used',
+    inject(function($rootScope, $compile) {
+
+    element = $compile('<ng-messages for="col">' +
+                       '  <ng-message when-exp="variable">Message is crazy</ng-message>' +
+                       '</ng-messages>')($rootScope);
+    $rootScope.$digest();
+
+    expect(element.text()).not.toContain('Message is crazy');
+
+    $rootScope.$apply(function() {
+      $rootScope.variable = 'error, failure';
+      $rootScope.col = { error: true };
+    });
+
+    expect(element.text()).toContain('Message is crazy');
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { error: false, failure: true };
+    });
+
+    expect(element.text()).toContain('Message is crazy');
+
+    $rootScope.$apply(function() {
+      $rootScope.variable = [];
+    });
+
+    expect(element.text()).not.toContain('Message is crazy');
+
+    $rootScope.$apply(function() {
+      $rootScope.variable = null;
+    });
+
+    expect(element.text()).not.toContain('Message is crazy');
+  }));
+
   they('should render empty when $prop is used as a collection value',
     { 'null': null,
       'false': false,
@@ -98,7 +227,7 @@ describe('ngMessages', function() {
         $rootScope.col = {};
       });
 
-      expect(element.children().length).toBe(0);
+      expect(messageChildren(element).length).toBe(0);
       expect(trim(element.text())).toEqual('');
 
       $rootScope.$apply(function() {
@@ -108,7 +237,7 @@ describe('ngMessages', function() {
         };
       });
 
-      expect(element.children().length).toBe(1);
+      expect(messageChildren(element).length).toBe(1);
       expect(trim(element.text())).toEqual('This message is blue');
 
       $rootScope.$apply(function() {
@@ -117,13 +246,13 @@ describe('ngMessages', function() {
         };
       });
 
-      expect(element.children().length).toBe(1);
+      expect(messageChildren(element).length).toBe(1);
       expect(trim(element.text())).toEqual('This message is red');
 
       $rootScope.$apply(function() {
         $rootScope.col = null;
       });
-      expect(element.children().length).toBe(0);
+      expect(messageChildren(element).length).toBe(0);
       expect(trim(element.text())).toEqual('');
 
 
@@ -134,7 +263,7 @@ describe('ngMessages', function() {
         };
       });
 
-      expect(element.children().length).toBe(0);
+      expect(messageChildren(element).length).toBe(0);
       expect(trim(element.text())).toEqual('');
     });
   });
@@ -189,6 +318,61 @@ describe('ngMessages', function() {
     expect(element.hasClass('ng-inactive')).toBe(false);
   }));
 
+  it('should automatically re-render the messages when other directives dynmically change them',
+    inject(function($rootScope, $compile) {
+
+    element = $compile('<div ng-messages="col">' +
+                       '  <div ng-message="primary">Enter something</div>' +
+                       '  <div ng-repeat="item in items">' +
+                       '    <div ng-message-exp="item.name">{{ item.text }}</div>' +
+                       '  </div>' +
+                       '</div>')($rootScope);
+
+    $rootScope.$apply(function() {
+      $rootScope.col = {};
+      $rootScope.items = [
+        { text: 'Your age is incorrect', name: 'age' },
+        { text: 'You\'re too tall man!', name: 'height' },
+        { text: 'Your hair is too long', name: 'hair' }
+      ];
+    });
+
+    expect(messageChildren(element).length).toBe(0);
+    expect(trim(element.text())).toEqual("");
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { hair: true };
+    });
+
+    expect(messageChildren(element).length).toBe(1);
+    expect(trim(element.text())).toEqual("Your hair is too long");
+
+    $rootScope.$apply(function() {
+      $rootScope.col = { age: true, hair: true};
+    });
+
+    expect(messageChildren(element).length).toBe(1);
+    expect(trim(element.text())).toEqual("Your age is incorrect");
+
+    $rootScope.$apply(function() {
+      // remove the age!
+      $rootScope.items.shift();
+    });
+
+    expect(messageChildren(element).length).toBe(1);
+    expect(trim(element.text())).toEqual("Your hair is too long");
+
+    $rootScope.$apply(function() {
+      // remove the hair!
+      $rootScope.items.length = 0;
+      $rootScope.col.primary = true;
+    });
+
+    expect(messageChildren(element).length).toBe(1);
+    expect(trim(element.text())).toEqual("Enter something");
+  }));
+
+
   it('should render animations when the active/inactive classes are added/removed', function() {
     module('ngAnimate');
     module('ngAnimateMock');
@@ -218,11 +402,95 @@ describe('ngMessages', function() {
   });
 
   describe('when including templates', function() {
+    they('should work with a dynamic collection model which is managed by ngRepeat',
+      {'<div ng-messages-include="...">': '<div ng-messages="item">' +
+                                            '<div ng-messages-include="abc.html"></div>' +
+                                          '</div>',
+       '<ng-messages-include src="...">': '<ng-messages for="item">' +
+                                            '<ng-messages-include src="abc.html"></ng-messages-include>' +
+                                          '</ng-messages>'},
+    function(html) {
+      inject(function($compile, $rootScope, $templateCache) {
+        $templateCache.put('abc.html', '<div ng-message="a">A</div>' +
+                                       '<div ng-message="b">B</div>' +
+                                       '<div ng-message="c">C</div>');
+
+        html = '<div><div ng-repeat="item in items">' + html + '</div></div>';
+        $rootScope.items = [{},{},{}];
+
+        element = $compile(html)($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.items[0].a = true;
+          $rootScope.items[1].b = true;
+          $rootScope.items[2].c = true;
+        });
+
+        var elements = element[0].querySelectorAll('[ng-repeat]');
+
+        // all three collections should have atleast one error showing up
+        expect(messageChildren(element).length).toBe(3);
+        expect(messageChildren(elements[0]).length).toBe(1);
+        expect(messageChildren(elements[1]).length).toBe(1);
+        expect(messageChildren(elements[2]).length).toBe(1);
+
+        // this is the standard order of the displayed error messages
+        expect(element.text().trim()).toBe('ABC');
+
+        $rootScope.$apply(function() {
+          $rootScope.items[0].a = false;
+          $rootScope.items[0].c = true;
+
+          $rootScope.items[1].b = false;
+
+          $rootScope.items[2].c = false;
+          $rootScope.items[2].a = true;
+        });
+
+        // with the 2nd item gone and the values changed
+        // we should see both 1 and 3 changed
+        expect(element.text().trim()).toBe('CA');
+
+        $rootScope.$apply(function() {
+          // add the value for the 2nd item back
+          $rootScope.items[1].b = true;
+          $rootScope.items.reverse();
+        });
+
+        // when reversed we get back to our original value
+        expect(element.text().trim()).toBe('ABC');
+      });
+    });
+
+    they('should remove the $prop element and place a comment anchor node where it used to be',
+      {'<div ng-messages-include="...">': '<div ng-messages="data">' +
+                                            '<div ng-messages-include="abc.html"></div>' +
+                                          '</div>',
+       '<ng-messages-include src="...">': '<ng-messages for="data">' +
+                                            '<ng-messages-include src="abc.html"></ng-messages-include>' +
+                                          '</ng-messages>'},
+    function(html) {
+      inject(function($compile, $rootScope, $templateCache) {
+        $templateCache.put('abc.html', '<div></div>');
+
+        element = $compile(html)($rootScope);
+        $rootScope.$digest();
+
+        var includeElement = element[0].querySelector('[ng-messages-include], ng-messages-include');
+        expect(includeElement).toBeFalsy();
+
+        var comment = element[0].childNodes[0];
+        expect(comment.nodeType).toBe(8);
+        expect(comment.nodeValue).toBe(' ngMessagesInclude: abc.html ');
+      });
+    });
+
     they('should load a remote template using $prop',
-      {'<div ng-messages ng-messages-include="...">':
-          '<div ng-messages="data" ng-messages-include="abc.html"></div>',
-       '<ng-messages include="...">':
-          '<ng-messages for="data" include="abc.html"></ng-messages>'},
+      {'<div ng-messages-include="...">': '<div ng-messages="data">' +
+                                            '<div ng-messages-include="abc.html"></div>' +
+                                          '</div>',
+       '<ng-messages-include src="...">': '<ng-messages for="data">' +
+                                            '<ng-messages-include src="abc.html"></ng-messages-include>' +
+                                          '</ng-messages>'},
     function(html) {
       inject(function($compile, $rootScope, $templateCache) {
         $templateCache.put('abc.html', '<div ng-message="a">A</div>' +
@@ -238,7 +506,7 @@ describe('ngMessages', function() {
           };
         });
 
-        expect(element.children().length).toBe(1);
+        expect(messageChildren(element).length).toBe(1);
         expect(trim(element.text())).toEqual("A");
 
         $rootScope.$apply(function() {
@@ -247,7 +515,7 @@ describe('ngMessages', function() {
           };
         });
 
-        expect(element.children().length).toBe(1);
+        expect(messageChildren(element).length).toBe(1);
         expect(trim(element.text())).toEqual("C");
       });
     });
@@ -255,11 +523,11 @@ describe('ngMessages', function() {
     it('should cache the template after download',
       inject(function($rootScope, $compile, $templateCache, $httpBackend) {
 
-      $httpBackend.expect('GET', 'tpl').respond(201, 'abc');
+      $httpBackend.expect('GET', 'tpl').respond(201, '<div>abc</div>');
 
       expect($templateCache.get('tpl')).toBeUndefined();
 
-      element = $compile('<div ng-messages="data" ng-messages-include="tpl"></div>')($rootScope);
+      element = $compile('<div ng-messages="data"><div ng-messages-include="tpl"></div></div>')($rootScope);
 
       $rootScope.$digest();
       $httpBackend.flush();
@@ -270,9 +538,11 @@ describe('ngMessages', function() {
     it('should re-render the messages after download without an extra digest',
       inject(function($rootScope, $compile, $httpBackend) {
 
-      $httpBackend.expect('GET', 'my-messages').respond(201,'<div ng-message="required">You did not enter a value</div>');
+      $httpBackend.expect('GET', 'my-messages').respond(201,
+        '<div ng-message="required">You did not enter a value</div>');
 
-      element = $compile('<div ng-messages="data" ng-messages-include="my-messages">' +
+      element = $compile('<div ng-messages="data">' +
+                         '  <div ng-messages-include="my-messages"></div>' +
                          '  <div ng-message="failed">Your value is that of failure</div>' +
                          '</div>')($rootScope);
 
@@ -283,24 +553,26 @@ describe('ngMessages', function() {
 
       $rootScope.$digest();
 
-      expect(element.children().length).toBe(1);
+      expect(messageChildren(element).length).toBe(1);
       expect(trim(element.text())).toEqual("Your value is that of failure");
 
       $httpBackend.flush();
+      $rootScope.$digest();
 
-      expect(element.children().length).toBe(1);
+      expect(messageChildren(element).length).toBe(1);
       expect(trim(element.text())).toEqual("You did not enter a value");
     }));
 
-    it('should allow for overriding the remote template messages within the element',
+    it('should allow for overriding the remote template messages within the element depending on where the remote template is placed',
       inject(function($compile, $rootScope, $templateCache) {
 
       $templateCache.put('abc.html', '<div ng-message="a">A</div>' +
                                      '<div ng-message="b">B</div>' +
                                      '<div ng-message="c">C</div>');
 
-      element = $compile('<div ng-messages="data" ng-messages-include="abc.html">' +
+      element = $compile('<div ng-messages="data">' +
                          '  <div ng-message="a">AAA</div>' +
+                         '  <div ng-messages-include="abc.html"></div>' +
                          '  <div ng-message="c">CCC</div>' +
                          '</div>')($rootScope);
 
@@ -312,7 +584,7 @@ describe('ngMessages', function() {
         };
       });
 
-      expect(element.children().length).toBe(1);
+      expect(messageChildren(element).length).toBe(1);
       expect(trim(element.text())).toEqual("AAA");
 
       $rootScope.$apply(function() {
@@ -322,7 +594,7 @@ describe('ngMessages', function() {
         };
       });
 
-      expect(element.children().length).toBe(1);
+      expect(messageChildren(element).length).toBe(1);
       expect(trim(element.text())).toEqual("B");
 
       $rootScope.$apply(function() {
@@ -331,51 +603,8 @@ describe('ngMessages', function() {
         };
       });
 
-      expect(element.children().length).toBe(1);
-      expect(trim(element.text())).toEqual("CCC");
-    }));
-
-    it('should retain the order of the remote template\'s messages when overriding within the element',
-      inject(function($compile, $rootScope, $templateCache) {
-
-      $templateCache.put('abc.html', '<div ng-message="c">C</div>' +
-                                     '<div ng-message="a">A</div>' +
-                                     '<div ng-message="b">B</div>');
-
-      element = $compile('<div ng-messages="data" ng-messages-include="abc.html">' +
-                         '  <div ng-message="a">AAA</div>' +
-                         '  <div ng-message="c">CCC</div>' +
-                         '</div>')($rootScope);
-
-      $rootScope.$apply(function() {
-        $rootScope.data = {
-          'a': 1,
-          'b': 2,
-          'c': 3
-        };
-      });
-
-      expect(element.children().length).toBe(1);
-      expect(trim(element.text())).toEqual("CCC");
-
-      $rootScope.$apply(function() {
-        $rootScope.data = {
-          'a': 1,
-          'b': 2
-        };
-      });
-
-      expect(element.children().length).toBe(1);
-      expect(trim(element.text())).toEqual("AAA");
-
-      $rootScope.$apply(function() {
-        $rootScope.data = {
-          'b': 3
-        };
-      });
-
-      expect(element.children().length).toBe(1);
-      expect(trim(element.text())).toEqual("B");
+      expect(messageChildren(element).length).toBe(1);
+      expect(trim(element.text())).toEqual("C");
     }));
 
   });
@@ -400,7 +629,7 @@ describe('ngMessages', function() {
           };
         });
 
-        expect(element.children().length).toBe(2);
+        expect(messageChildren(element).length).toBe(2);
         expect(s(element.text())).toContain("13");
       });
     });
@@ -412,9 +641,9 @@ describe('ngMessages', function() {
                                      '<div ng-message="y">Y</div>' +
                                      '<div ng-message="z">Z</div>');
 
-      element = $compile('<div ng-messages="data" ' +
-                         'ng-messages-multiple="true" ' +
-                         'ng-messages-include="xyz.html"></div>')($rootScope);
+      element = $compile('<div ng-messages="data" ng-messages-multiple="true">' +
+                           '<div ng-messages-include="xyz.html"></div>' +
+                         '</div>')($rootScope);
 
       $rootScope.$apply(function() {
         $rootScope.data = {
@@ -424,14 +653,14 @@ describe('ngMessages', function() {
         };
       });
 
-      expect(element.children().length).toBe(2);
+      expect(messageChildren(element).length).toBe(2);
       expect(s(element.text())).toEqual("XZ");
 
       $rootScope.$apply(function() {
         $rootScope.data.y = {};
       });
 
-      expect(element.children().length).toBe(3);
+      expect(messageChildren(element).length).toBe(3);
       expect(s(element.text())).toEqual("XYZ");
     }));
 
@@ -442,11 +671,10 @@ describe('ngMessages', function() {
                                      '<div ng-message="y">Y</div>' +
                                      '<div ng-message="z">Z</div>');
 
-      element = $compile('<div ng-messages="data" ' +
-                              'ng-messages-multiple="true" ' +
-                              'ng-messages-include="xyz.html">' +
-                                '<div ng-message="y">YYY</div>' +
-                                '<div ng-message="z">ZZZ</div>' +
+      element = $compile('<div ng-messages="data" ng-messages-multiple="true">' +
+                            '<div ng-message="y">YYY</div>' +
+                            '<div ng-message="z">ZZZ</div>' +
+                            '<div ng-messages-include="xyz.html"></div>' +
                          '</div>')($rootScope);
 
       $rootScope.$apply(function() {
@@ -457,15 +685,15 @@ describe('ngMessages', function() {
         };
       });
 
-      expect(element.children().length).toBe(2);
-      expect(s(element.text())).toEqual("XZZZ");
+      expect(messageChildren(element).length).toBe(2);
+      expect(s(element.text())).toEqual("ZZZX");
 
       $rootScope.$apply(function() {
         $rootScope.data.y = {};
       });
 
-      expect(element.children().length).toBe(3);
-      expect(s(element.text())).toEqual("XYYYZZZ");
+      expect(messageChildren(element).length).toBe(3);
+      expect(s(element.text())).toEqual("YYYZZZX");
     }));
   });
 });
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
index 104ece1c0aa5..711b3c09390f 100644
--- a/test/ngMock/angular-mocksSpec.js
+++ b/test/ngMock/angular-mocksSpec.js
@@ -719,8 +719,6 @@ describe('ngMock', function() {
 
     it('should serialize scope that has overridden "hasOwnProperty"', inject(function($rootScope, $sniffer) {
       /* jshint -W001 */
-      // MS IE8 just doesn't work for this kind of thing, since "for ... in" doesn't return
-      // things like hasOwnProperty even if it is explicitly defined on the actual object!
       $rootScope.hasOwnProperty = 'X';
       expect(d($rootScope)).toMatch(/Scope\(.*\): \{/);
       expect(d($rootScope)).toMatch(/hasOwnProperty: "X"/);
@@ -906,10 +904,6 @@ describe('ngMock', function() {
       });
 
 
-      // We don't run the following tests on IE8.
-      // IE8 throws "Object does not support this property or method." error,
-      // when thrown from a function defined on window (which `inject` is).
-
       it('should not change thrown Errors', inject(function($sniffer) {
         expect(function() {
           inject(function() {
@@ -1751,6 +1745,28 @@ describe('ngMock', function() {
       }));
     });
   });
+
+
+  describe('$controllerDecorator', function() {
+    it('should support creating controller with bindings', function() {
+      var called = false;
+      var data = [
+        { name: 'derp1', id: 0 },
+        { name: 'testname', id: 1 },
+        { name: 'flurp', id: 2 }
+      ];
+      module(function($controllerProvider) {
+        $controllerProvider.register('testCtrl', function() {
+          called = true;
+          expect(this.data).toBe(data);
+        });
+      });
+      inject(function($controller, $rootScope) {
+        $controller('testCtrl', { scope: $rootScope }, { data: data });
+        expect(called).toBe(true);
+      });
+    });
+  });
 });
 
 
diff --git a/test/ngResource/resourceSpec.js b/test/ngResource/resourceSpec.js
index ba72525e6de9..da2ca6cd9fb1 100644
--- a/test/ngResource/resourceSpec.js
+++ b/test/ngResource/resourceSpec.js
@@ -44,6 +44,7 @@ describe("resource", function() {
       expect(isValidDottedPath('1abc')).toBe(false);
       expect(isValidDottedPath('.')).toBe(false);
       expect(isValidDottedPath('$')).toBe(true);
+      expect(isValidDottedPath('@')).toBe(true);
       expect(isValidDottedPath('a')).toBe(true);
       expect(isValidDottedPath('A')).toBe(true);
       expect(isValidDottedPath('a1')).toBe(true);
@@ -53,12 +54,14 @@ describe("resource", function() {
       expect(isValidDottedPath('$.$')).toBe(true);
       expect(isValidDottedPath('.$')).toBe(false);
       expect(isValidDottedPath('$.')).toBe(false);
+      expect(isValidDottedPath('@.')).toBe(false);
+      expect(isValidDottedPath('.@')).toBe(false);
     });
   });
 
   describe('lookupDottedPath', function() {
     /* global lookupDottedPath: false */
-    var data = {a: {b: 'foo', c: null}};
+    var data = {a: {b: 'foo', c: null, '@d':'d-foo'},'@b':'b-foo'};
 
     it('should throw for invalid path', function() {
       expect(function() {
@@ -68,9 +71,11 @@ describe("resource", function() {
     });
 
     it('should get dotted paths', function() {
-      expect(lookupDottedPath(data, 'a')).toEqual({b: 'foo', c: null});
+      expect(lookupDottedPath(data, 'a')).toEqual({b: 'foo', c: null, '@d':'d-foo'});
       expect(lookupDottedPath(data, 'a.b')).toBe('foo');
       expect(lookupDottedPath(data, 'a.c')).toBeNull();
+      expect(lookupDottedPath(data, 'a.@d')).toBe('d-foo');
+      expect(lookupDottedPath(data, '@b')).toBe('b-foo');
     });
 
     it('should skip over null/undefined members', function() {
@@ -1295,7 +1300,7 @@ describe("resource", function() {
 });
 
 describe('resource', function() {
-  var $httpBackend, $resource;
+  var $httpBackend, $resource, $q;
 
   beforeEach(module(function($exceptionHandlerProvider) {
     $exceptionHandlerProvider.mode('log');
@@ -1306,6 +1311,7 @@ describe('resource', function() {
   beforeEach(inject(function($injector) {
     $httpBackend = $injector.get('$httpBackend');
     $resource = $injector.get('$resource');
+    $q = $injector.get('$q');
   }));
 
 
@@ -1322,7 +1328,7 @@ describe('resource', function() {
     expect(successSpy).not.toHaveBeenCalled();
     expect(failureSpy).toHaveBeenCalled();
     expect(failureSpy.mostRecentCall.args[0]).toMatch(
-        /^\[\$resource:badcfg\] Error in resource configuration for action `query`\. Expected response to contain an array but got an object/
+        /^\[\$resource:badcfg\] Error in resource configuration for action `query`\. Expected response to contain an array but got an object \(Request: GET \/Customer\/123\)/
       );
   });
 
@@ -1339,9 +1345,40 @@ describe('resource', function() {
     expect(successSpy).not.toHaveBeenCalled();
     expect(failureSpy).toHaveBeenCalled();
     expect(failureSpy.mostRecentCall.args[0]).toMatch(
-        /^\[\$resource:badcfg\] Error in resource configuration for action `get`\. Expected response to contain an object but got an array/
+        /^\[\$resource:badcfg\] Error in resource configuration for action `get`\. Expected response to contain an object but got an array \(Request: GET \/Customer\/123\)/
       );
   });
 
+  it('If timeout promise is resolved, cancel the request', function() {
+    var canceler = $q.defer();
+
+    $httpBackend.when('GET', '/CreditCard').respond({data: '123'});
+
+    var CreditCard = $resource('/CreditCard', {}, {
+      query: {
+        method: 'GET',
+        timeout: canceler.promise
+      }
+    });
+
+    CreditCard.query();
+
+    canceler.resolve();
+    expect(function() { $httpBackend.flush();}).toThrow(new Error("No pending request to flush !"));
+
+    canceler = $q.defer();
+    CreditCard = $resource('/CreditCard', {}, {
+      query: {
+        method: 'GET',
+        timeout: canceler.promise
+      }
+    });
+
+    CreditCard.query();
+    expect(function() { $httpBackend.flush();}).not.toThrow(new Error("No pending request to flush !"));
+
+
+  });
+
 
 });
diff --git a/test/ngRoute/directive/ngViewSpec.js b/test/ngRoute/directive/ngViewSpec.js
index c910ba509b0d..8e4b2a0a95dd 100644
--- a/test/ngRoute/directive/ngViewSpec.js
+++ b/test/ngRoute/directive/ngViewSpec.js
@@ -501,8 +501,7 @@ describe('ngView', function() {
 
       $location.url('/foo');
       $rootScope.$digest();
-      // using toMatch because in IE8+jquery the space doesn't get preserved. jquery bug?
-      expect(element.text()).toMatch(/\s*WORKS/);
+      expect(element.text()).toEqual('   \n   WORKS');
 
       var div = element.find('div');
       expect(div.parent()[0].nodeName.toUpperCase()).toBeOneOf('NG:VIEW', 'VIEW');
@@ -777,8 +776,6 @@ describe('ngView animations', function() {
         expect($animate.queue.shift().event).toBe('addClass');
         expect($animate.queue.shift().event).toBe('removeClass');
 
-        $animate.triggerReflow();
-
         expect(item.hasClass('classy')).toBe(false);
         expect(item.hasClass('boring')).toBe(true);
 
@@ -813,7 +810,7 @@ describe('ngView animations', function() {
         });
       });
 
-      inject(function($rootScope, $compile, $location, $route, $timeout, $rootElement, $sniffer, $animate) {
+      inject(function($rootScope, $compile, $location, $route, $timeout, $rootElement, $sniffer, $animate, $$rAF) {
         element = $compile(html('<div><ng:view onload="load()" class="my-animation"></ng:view></div>'))($rootScope);
         $animate.enabled(true);
 
@@ -837,6 +834,8 @@ describe('ngView animations', function() {
         expect($animate.queue.shift().event).toBe('enter'); //ngRepeat 3
         expect($animate.queue.shift().event).toBe('enter'); //ngRepeat 4
 
+        $$rAF.flush();
+
         expect(element.text()).toEqual('34');
 
         function n(text) {
diff --git a/test/ngSanitize/filter/linkySpec.js b/test/ngSanitize/filter/linkySpec.js
index baac45bd6d82..f0c4f3956e54 100644
--- a/test/ngSanitize/filter/linkySpec.js
+++ b/test/ngSanitize/filter/linkySpec.js
@@ -20,6 +20,15 @@ describe('linky', function() {
     expect(linky(undefined)).not.toBeDefined();
   });
 
+  it('should be case-insensitive', function() {
+    expect(linky('WWW.example.com')).toEqual('<a href="http://WWW.example.com">WWW.example.com</a>');
+    expect(linky('WWW.EXAMPLE.COM')).toEqual('<a href="http://WWW.EXAMPLE.COM">WWW.EXAMPLE.COM</a>');
+    expect(linky('HTTP://www.example.com')).toEqual('<a href="HTTP://www.example.com">HTTP://www.example.com</a>');
+    expect(linky('HTTP://example.com')).toEqual('<a href="HTTP://example.com">HTTP://example.com</a>');
+    expect(linky('HTTPS://www.example.com')).toEqual('<a href="HTTPS://www.example.com">HTTPS://www.example.com</a>');
+    expect(linky('HTTPS://example.com')).toEqual('<a href="HTTPS://example.com">HTTPS://example.com</a>');
+  });
+
   it('should handle www.', function() {
     expect(linky('www.example.com')).toEqual('<a href="http://www.example.com">www.example.com</a>');
   });
diff --git a/test/ngSanitize/sanitizeSpec.js b/test/ngSanitize/sanitizeSpec.js
index 2642bdf6fde9..33d036c97efc 100644
--- a/test/ngSanitize/sanitizeSpec.js
+++ b/test/ngSanitize/sanitizeSpec.js
@@ -251,6 +251,12 @@ describe('HTML', function() {
         .toEqual('<svg width="400px" height="150px" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red"/></svg>');
   });
 
+  it('should not ignore white-listed svg camelCased attributes', function() {
+    expectHTML('<svg preserveAspectRatio="true"></svg>')
+        .toEqual('<svg preserveAspectRatio="true"></svg>');
+
+  });
+
   it('should sanitize SVG xlink:href attribute values', function() {
     expectHTML('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><a xlink:href="javascript:alert()"></a></svg>')
         .toEqual('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><a></a></svg>');
@@ -267,6 +273,15 @@ describe('HTML', function() {
       .toEqual('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><a></a></svg>');
   });
 
+  it('should not accept SVG animation tags', function() {
+    expectHTML('<svg xmlns:xlink="http://www.w3.org/1999/xlink"><a><text y="1em">Click me</text><animate attributeName="xlink:href" values="javascript:alert(1)"/></a></svg>')
+      .toEqual('<svg xmlns:xlink="http://www.w3.org/1999/xlink"><a><text y="1em">Click me</text></a></svg>');
+
+    expectHTML('<svg><a xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="?"><circle r="400"></circle>' +
+    '<animate attributeName="xlink:href" begin="0" from="javascript:alert(1)" to="&" /></a></svg>')
+      .toEqual('<svg><a xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="?"><circle r="400"></circle></a></svg>');
+  });
+
   describe('htmlSanitizerWriter', function() {
     /* global htmlSanitizeWriter: false */
     if (angular.isUndefined(window.htmlSanitizeWriter)) return;
@@ -495,8 +510,7 @@ describe('HTML', function() {
 });
 
 describe('decodeEntities', function() {
-  var handler, text,
-      origHiddenPre = window.hiddenPre;
+  var handler, text;
 
   beforeEach(function() {
     text = '';
@@ -511,37 +525,13 @@ describe('decodeEntities', function() {
     module('ngSanitize');
   });
 
-  afterEach(function() {
-    window.hiddenPre = origHiddenPre;
+  it('should unescape text', function() {
+    htmlParser('a&lt;div&gt;&amp;&lt;/div&gt;c', handler);
+    expect(text).toEqual('a<div>&</div>c');
   });
 
-  it('should use innerText if textContent is not available (IE<9)', function() {
-    window.hiddenPre = {
-      innerText: 'INNER_TEXT'
-    };
-    inject(function($sanitize) {
-      htmlParser('<tag>text</tag>', handler);
-      expect(text).toEqual('INNER_TEXT');
-    });
-  });
-  it('should use textContent if available', function() {
-    window.hiddenPre = {
-      textContent: 'TEXT_CONTENT',
-      innerText: 'INNER_TEXT'
-    };
-    inject(function($sanitize) {
-      htmlParser('<tag>text</tag>', handler);
-      expect(text).toEqual('TEXT_CONTENT');
-    });
-  });
-  it('should use textContent even if empty', function() {
-    window.hiddenPre = {
-      textContent: '',
-      innerText: 'INNER_TEXT'
-    };
-    inject(function($sanitize) {
-      htmlParser('<tag>text</tag>', handler);
-      expect(text).toEqual('');
-    });
+  it('should preserve whitespace', function() {
+    htmlParser('  a&amp;b ', handler);
+    expect(text).toEqual('  a&b ');
   });
 });
diff --git a/test/ngTouch/directive/ngClickSpec.js b/test/ngTouch/directive/ngClickSpec.js
index 921c64578b2b..179b0248ff21 100644
--- a/test/ngTouch/directive/ngClickSpec.js
+++ b/test/ngTouch/directive/ngClickSpec.js
@@ -5,8 +5,8 @@ describe('ngClick (touch)', function() {
 
   // TODO(braden): Once we have other touch-friendly browsers on CI, allow them here.
   // Currently Firefox and IE refuse to fire touch events.
-  var chrome = /chrome/.test(navigator.userAgent.toLowerCase());
-  if (!chrome) {
+  // Enable iPhone for manual testing.
+  if (!/chrome|iphone/i.test(navigator.userAgent)) {
     return;
   }
 
@@ -48,6 +48,34 @@ describe('ngClick (touch)', function() {
     expect($rootScope.event).toBeDefined();
   }));
 
+  if (window.jQuery) {
+    it('should not unwrap a jQuery-wrapped event object on click', inject(function($rootScope, $compile) {
+      element = $compile('<div ng-click="event = $event"></div>')($rootScope);
+      $rootScope.$digest();
+
+      browserTrigger(element, 'click', {
+        keys: [],
+        x: 10,
+        y: 10
+      });
+      expect($rootScope.event.originalEvent).toBeDefined();
+      expect($rootScope.event.originalEvent.clientX).toBe(10);
+      expect($rootScope.event.originalEvent.clientY).toBe(10);
+    }));
+
+    it('should not unwrap a jQuery-wrapped event object on touchstart/touchend',
+        inject(function($rootScope, $compile, $rootElement) {
+      element = $compile('<div ng-click="event = $event"></div>')($rootScope);
+      $rootElement.append(element);
+      $rootScope.$digest();
+
+      browserTrigger(element, 'touchstart');
+      browserTrigger(element, 'touchend');
+
+      expect($rootScope.event.originalEvent).toBeDefined();
+    }));
+  }
+
 
   it('should not click if the touch is held too long', inject(function($rootScope, $compile, $rootElement) {
     element = $compile('<div ng-click="count = count + 1"></div>')($rootScope);
@@ -97,7 +125,7 @@ describe('ngClick (touch)', function() {
   }));
 
 
-  it('should not click if a touchmove comes before touchend', inject(function($rootScope, $compile, $rootElement) {
+  it('should not prevent click if a touchmove comes before touchend', inject(function($rootScope, $compile, $rootElement) {
     element = $compile('<div ng-click="tapped = true"></div>')($rootScope);
     $rootElement.append(element);
     $rootScope.$digest();
@@ -112,11 +140,11 @@ describe('ngClick (touch)', function() {
     browserTrigger(element, 'touchmove');
     browserTrigger(element, 'touchend',{
       keys: [],
-      x: 400,
-      y: 400
+      x: 15,
+      y: 15
     });
 
-    expect($rootScope.tapped).toBeUndefined();
+    expect($rootScope.tapped).toEqual(true);
   }));
 
   it('should add the CSS class while the element is held down, and then remove it', inject(function($rootScope, $compile, $rootElement) {
@@ -143,6 +171,18 @@ describe('ngClick (touch)', function() {
     expect($rootScope.tapped).toBe(true);
   }));
 
+  it('should click when target element is an SVG', inject(
+    function($rootScope, $compile, $rootElement) {
+      element = $compile('<svg ng-click="tapped = true"></svg>')($rootScope);
+      $rootElement.append(element);
+      $rootScope.$digest();
+
+      browserTrigger(element, 'touchstart');
+      browserTrigger(element, 'touchend');
+      browserTrigger(element, 'click', {x:1, y:1});
+
+      expect($rootScope.tapped).toEqual(true);
+  }));
 
   describe('the clickbuster', function() {
     var element1, element2;
@@ -463,6 +503,17 @@ describe('ngClick (touch)', function() {
 
         expect($rootScope.selection).toBe('initial');
       });
+
+
+      it('should blur the other element on click', function() {
+        var blurSpy = spyOn(otherElement, 'blur');
+        touch(otherElement, 10, 10);
+
+        time = 500;
+        click(label, 10, 10);
+
+        expect(blurSpy).toHaveBeenCalled();
+      });
     });
   });
 
diff --git a/test/ngTouch/swipeSpec.js b/test/ngTouch/swipeSpec.js
index 416d9f5d632d..1135ba3c19d8 100644
--- a/test/ngTouch/swipeSpec.js
+++ b/test/ngTouch/swipeSpec.js
@@ -67,8 +67,8 @@ describe('$swipe', function() {
       if (restrictBrowsers) {
         // TODO(braden): Once we have other touch-friendly browsers on CI, allow them here.
         // Currently Firefox and IE refuse to fire touch events.
-        var chrome = /chrome/.test(navigator.userAgent.toLowerCase());
-        if (!chrome) {
+        // Enable iPhone for manual testing.
+        if (!/chrome|iphone/i.test(navigator.userAgent)) {
           return;
         }
       }