Merge branch 'master' of github.com:RenovoSolutions/TypeScript-Angular-Components into mock-ing-bird-ing

Author: JoshDSommer

package.json

@@ -48,6 +48,18 @@
   },
   "devDependencies": {
     "@renovolive/gulp-utilities": "~2.4.0",
+    "@types/angular": "1.5.16",
+    "@types/angular-mocks": "^1.5.9",
+    "@types/angular-ui-bootstrap": "~0.13.35",
+    "@types/bootstrap": "~3.3.32",
+    "@types/bootstrap-touchspin": "0.0.29",
+    "@types/chai": "~3.4.33",
+    "@types/core-js": "0.9.35",
+    "@types/jquery": "~2.0.32",
+    "@types/jquery.jsignature": "~2.0.28",
+    "@types/lodash": "^4.14.53",
+    "@types/moment-timezone": "^0.2.34",
+    "@types/sinon": "^1.16.35",
     "chai": "~3.5.0",
     "concurrently": "~2.0.0",
     "del": "^2.2.0",
@@ -84,18 +96,6 @@
     "@angular/platform-browser-dynamic": "~2.4.0",
     "@angular/router": "~3.4.0",
     "@angular/upgrade": "~2.4.0",
-    "@types/angular": "1.5.16",
-    "@types/angular-ui-bootstrap": "~0.13.35",
-    "@types/angular-mocks": "^1.5.9",
-    "@types/bootstrap": "~3.3.32",
-    "@types/bootstrap-touchspin": "0.0.29",
-    "@types/chai": "~3.4.33",
-    "@types/core-js": "~0.9.34",
-    "@types/jquery": "~2.0.32",
-    "@types/jquery.jsignature": "~2.0.28",
-    "@types/lodash": "^4.14.53",
-    "@types/moment-timezone": "^0.2.34",
-    "@types/sinon": "^1.16.35",
     "angular": "~1.5.3",
     "angular-animate": "~1.5.3",
     "angular-mocks": "~1.5.0",