From 2ca5a9e7040a2cf016420986e85609b1c7c273d1 Mon Sep 17 00:00:00 2001
From: louis <heicrd@cock.li>
Date: Thu, 7 Nov 2019 15:09:05 -0500
Subject: [PATCH 1/7] js: move bgmloop to data folder

Having xdu-specific data in this repo doesn't make much sense when most of the
data is fairly general to the engine, plus now I don't have to make a commit
every time I want to update the data.
---
 Js/BgmLoop.json  | 1497 ----------------------------------------------
 Js/UtageParse.js |    2 +-
 gulpfile.js      |   10 -
 3 files changed, 1 insertion(+), 1508 deletions(-)
 delete mode 100644 Js/BgmLoop.json

diff --git a/Js/BgmLoop.json b/Js/BgmLoop.json
deleted file mode 100644
index 082fab7..0000000
--- a/Js/BgmLoop.json
+++ /dev/null
@@ -1,1497 +0,0 @@
-{
-	"bgm_adv_battle_01": {
-		"duration": 93.01484375,
-		"loop_end": {
-			"samples_48k": 4464640,
-			"samples_native": 2976427,
-			"seconds": 93.01334375
-		},
-		"loop_start": {
-			"samples_48k": 543504,
-			"samples_native": 362336,
-			"seconds": 11.323
-		}
-	},
-	"bgm_adv_battle_02": {
-		"duration": 94.41484375,
-		"loop_end": {
-			"samples_48k": 4531845,
-			"samples_native": 3021230,
-			"seconds": 94.4134375
-		},
-		"loop_start": {
-			"samples_48k": 330432,
-			"samples_native": 220288,
-			"seconds": 6.884
-		}
-	},
-	"bgm_adv_comical_01": {
-		"duration": 57.7235625,
-		"loop_end": {
-			"samples_48k": 2770663,
-			"samples_native": 1847109,
-			"seconds": 57.72215625
-		},
-		"loop_start": {
-			"samples_48k": 250656,
-			"samples_native": 167104,
-			"seconds": 5.222
-		}
-	},
-	"bgm_adv_comical_02": {
-		"duration": 71.2195,
-		"loop_end": {
-			"samples_48k": 3418456,
-			"samples_native": 2278971,
-			"seconds": 71.21784375
-		},
-		"loop_start": {
-			"samples_48k": 625728,
-			"samples_native": 417152,
-			"seconds": 13.036
-		}
-	},
-	"bgm_adv_emergency_01": {
-		"duration": 98.295,
-		"loop_end": {
-			"samples_48k": 4718094,
-			"samples_native": 3145396,
-			"seconds": 98.293625
-		},
-		"loop_start": {
-			"samples_48k": 1304784,
-			"samples_native": 869856,
-			"seconds": 27.183
-		}
-	},
-	"bgm_adv_emergency_02": {
-		"duration": 76.7199375,
-		"loop_end": {
-			"samples_48k": 3682461,
-			"samples_native": 2454974,
-			"seconds": 76.7179375
-		},
-		"loop_start": {
-			"samples_48k": 720144,
-			"samples_native": 480096,
-			"seconds": 15.003
-		}
-	},
-	"bgm_adv_everyday_01": {
-		"duration": 75.8483125,
-		"loop_end": {
-			"samples_48k": 3640636,
-			"samples_native": 2427091,
-			"seconds": 75.84659375
-		},
-		"loop_start": {
-			"samples_48k": 349200,
-			"samples_native": 232800,
-			"seconds": 7.275
-		}
-	},
-	"bgm_adv_everyday_02": {
-		"duration": 70.43615625,
-		"loop_end": {
-			"samples_48k": 3380871,
-			"samples_native": 2253914,
-			"seconds": 70.4348125
-		},
-		"loop_start": {
-			"samples_48k": 588144,
-			"samples_native": 392096,
-			"seconds": 12.253
-		}
-	},
-	"bgm_adv_everyday_03": {
-		"duration": 78.99671875,
-		"loop_end": {
-			"samples_48k": 3791752,
-			"samples_native": 2527835,
-			"seconds": 78.99484375
-		},
-		"loop_start": {
-			"samples_48k": 436416,
-			"samples_native": 290944,
-			"seconds": 9.092
-		}
-	},
-	"bgm_adv_everyday_04": {
-		"duration": 66.528375,
-		"loop_end": {
-			"samples_48k": 3193291,
-			"samples_native": 2128861,
-			"seconds": 66.52690625
-		},
-		"loop_start": {
-			"samples_48k": 313296,
-			"samples_native": 208864,
-			"seconds": 6.527
-		}
-	},
-	"bgm_adv_highlight_01": {
-		"duration": 97.1335,
-		"loop_end": {
-			"samples_48k": 4662328,
-			"samples_native": 3108219,
-			"seconds": 97.13184375
-		},
-		"loop_start": {
-			"samples_48k": 473232,
-			"samples_native": 315488,
-			"seconds": 9.859
-		}
-	},
-	"bgm_adv_highlight_02": {
-		"duration": 76.46521875,
-		"loop_end": {
-			"samples_48k": 3670234,
-			"samples_native": 2446823,
-			"seconds": 76.46321875
-		},
-		"loop_start": {
-			"samples_48k": 648768,
-			"samples_native": 432512,
-			"seconds": 13.516
-		}
-	},
-	"bgm_adv_highlight_03": {
-		"duration": 109.82465625,
-		"loop_end": {
-			"samples_48k": 5271502,
-			"samples_native": 3514335,
-			"seconds": 109.82296875
-		},
-		"loop_start": {
-			"samples_48k": 1476672,
-			"samples_native": 984448,
-			"seconds": 30.764
-		}
-	},
-	"bgm_adv_highlight_04": {
-		"duration": 102.86365625,
-		"loop_end": {
-			"samples_48k": 4937361,
-			"samples_native": 3291574,
-			"seconds": 102.8616875
-		},
-		"loop_start": {
-			"samples_48k": 682224,
-			"samples_native": 454816,
-			"seconds": 14.213
-		}
-	},
-	"bgm_adv_peace_01": {
-		"duration": 83.74309375,
-		"loop_end": {
-			"samples_48k": 4019584,
-			"samples_native": 2679723,
-			"seconds": 83.74134375
-		},
-		"loop_start": {
-			"samples_48k": 541344,
-			"samples_native": 360896,
-			"seconds": 11.278
-		}
-	},
-	"bgm_adv_peace_02": {
-		"duration": 67.32375,
-		"loop_end": {
-			"samples_48k": 3231464,
-			"samples_native": 2154309,
-			"seconds": 67.32215625
-		},
-		"loop_start": {
-			"samples_48k": 386400,
-			"samples_native": 257600,
-			"seconds": 8.05
-		}
-	},
-	"bgm_adv_sorrow_01": {
-		"duration": 75.9431875,
-		"loop_end": {
-			"samples_48k": 3645204,
-			"samples_native": 2430136,
-			"seconds": 75.94175
-		},
-		"loop_start": {
-			"samples_48k": 975936,
-			"samples_native": 650624,
-			"seconds": 20.332
-		}
-	},
-	"bgm_adv_sorrow_02": {
-		"duration": 78.8830625,
-		"loop_end": {
-			"samples_48k": 3786321,
-			"samples_native": 2524214,
-			"seconds": 78.8816875
-		},
-		"loop_start": {
-			"samples_48k": 680016,
-			"samples_native": 453344,
-			"seconds": 14.167
-		}
-	},
-	"bgm_adv_tension_01": {
-		"duration": 66.506,
-		"loop_end": {
-			"samples_48k": 3192193,
-			"samples_native": 2128129,
-			"seconds": 66.50403125
-		},
-		"loop_start": {
-			"samples_48k": 411504,
-			"samples_native": 274336,
-			"seconds": 8.573
-		}
-	},
-	"bgm_adv_tension_02": {
-		"duration": 75.747875,
-		"loop_end": {
-			"samples_48k": 3635811,
-			"samples_native": 2423874,
-			"seconds": 75.7460625
-		},
-		"loop_start": {
-			"samples_48k": 545088,
-			"samples_native": 363392,
-			"seconds": 11.356
-		}
-	},
-	"bgm_adv_tension_03": {
-		"duration": 96.00084375,
-		"loop_end": {
-			"samples_48k": 4607959,
-			"samples_native": 3071973,
-			"seconds": 95.99915625
-		},
-		"loop_start": {
-			"samples_48k": 383952,
-			"samples_native": 255968,
-			"seconds": 7.999
-		}
-	},
-	"bgm_home_01": {
-		"duration": 76.73034375,
-		"loop_end": {
-			"samples_48k": 3682962,
-			"samples_native": 2455308,
-			"seconds": 76.728375
-		},
-		"loop_start": {
-			"samples_48k": 850176,
-			"samples_native": 566784,
-			"seconds": 17.712
-		}
-	},
-	"bgm_raid_01": {
-		"duration": 111.7009375,
-		"loop_end": {
-			"samples_48k": 5361571,
-			"samples_native": 3574381,
-			"seconds": 111.69940625
-		},
-		"loop_start": {
-			"samples_48k": 1110144,
-			"samples_native": 740096,
-			"seconds": 23.128
-		}
-	},
-	"jingle_gacha": {
-		"duration": 15.652,
-		"loop_end": {
-			"samples_48k": 751200,
-			"samples_native": 500800,
-			"seconds": 15.65
-		},
-		"loop_start": {
-			"samples_48k": 290400,
-			"samples_native": 193600,
-			"seconds": 6.05
-		}
-	},
-	"musicBase": {
-		"duration": 86.40134375,
-		"loop_end": {
-			"samples_48k": 4147201,
-			"samples_native": 2764801,
-			"seconds": 86.40003125
-		},
-		"loop_start": {
-			"samples_48k": 0,
-			"samples_native": 0,
-			"seconds": 0.0
-		}
-	},
-	"music_adam_weishaupt": {
-		"duration": 73.6201875,
-		"loop_end": {
-			"samples_48k": 3533703,
-			"samples_native": 2355802,
-			"seconds": 73.6188125
-		},
-		"loop_start": {
-			"samples_48k": 393648,
-			"samples_native": 262432,
-			"seconds": 8.201
-		}
-	},
-	"music_akatuki_no_sora": {
-		"duration": 100.88696875,
-		"loop_end": {
-			"samples_48k": 4842487,
-			"samples_native": 3228325,
-			"seconds": 100.88515625
-		},
-		"loop_start": {
-			"samples_48k": 1297872,
-			"samples_native": 865248,
-			"seconds": 27.039
-		}
-	},
-	"music_angelic_remnant": {
-		"duration": 142.8000625,
-		"loop_end": {
-			"samples_48k": 6854332,
-			"samples_native": 4569555,
-			"seconds": 142.79859375
-		},
-		"loop_start": {
-			"samples_48k": 1594848,
-			"samples_native": 1063232,
-			"seconds": 33.226
-		}
-	},
-	"music_apple": {
-		"duration": 86.01065625,
-		"loop_end": {
-			"samples_48k": 4128439,
-			"samples_native": 2752293,
-			"seconds": 86.00915625
-		},
-		"loop_start": {
-			"samples_48k": 0,
-			"samples_native": 0,
-			"seconds": 0.0
-		}
-	},
-	"music_asu_no_gaika": {
-		"duration": 89.30321875,
-		"loop_end": {
-			"samples_48k": 4286482,
-			"samples_native": 2857655,
-			"seconds": 89.30171875
-		},
-		"loop_start": {
-			"samples_48k": 961632,
-			"samples_native": 641088,
-			"seconds": 20.034
-		}
-	},
-	"music_axia_no_kaze": {
-		"duration": 227.14678125,
-		"loop_end": {
-			"samples_48k": 10902963,
-			"samples_native": 7268642,
-			"seconds": 227.1450625
-		},
-		"loop_start": {
-			"samples_48k": 7334256,
-			"samples_native": 4889504,
-			"seconds": 152.797
-		}
-	},
-	"music_beyond_the_blade": {
-		"duration": 107.07978125,
-		"loop_end": {
-			"samples_48k": 5139739,
-			"samples_native": 3426493,
-			"seconds": 107.07790625
-		},
-		"loop_start": {
-			"samples_48k": 1172256,
-			"samples_native": 781504,
-			"seconds": 24.422
-		}
-	},
-	"music_bye_bye_lullaby": {
-		"duration": 77.39109375,
-		"loop_end": {
-			"samples_48k": 3714693,
-			"samples_native": 2476462,
-			"seconds": 77.3894375
-		},
-		"loop_start": {
-			"samples_48k": 892320,
-			"samples_native": 594880,
-			"seconds": 18.59
-		}
-	},
-	"music_change_the_future": {
-		"duration": 119.41009375,
-		"loop_end": {
-			"samples_48k": 5731599,
-			"samples_native": 3821066,
-			"seconds": 119.4083125
-		},
-		"loop_start": {
-			"samples_48k": 1972320,
-			"samples_native": 1314880,
-			"seconds": 41.09
-		}
-	},
-	"music_daisukisukisugi": {
-		"duration": 93.21253125,
-		"loop_end": {
-			"samples_48k": 4474110,
-			"samples_native": 2982740,
-			"seconds": 93.210625
-		},
-		"loop_start": {
-			"samples_48k": 322416,
-			"samples_native": 214944,
-			"seconds": 6.717
-		}
-	},
-	"music_dangerous_sunshine": {
-		"duration": 99.20853125,
-		"loop_end": {
-			"samples_48k": 4761918,
-			"samples_native": 3174612,
-			"seconds": 99.206625
-		},
-		"loop_start": {
-			"samples_48k": 1238112,
-			"samples_native": 825408,
-			"seconds": 25.794
-		}
-	},
-	"music_dareka_no_tame_no_hikari": {
-		"duration": 108.5063125,
-		"loop_end": {
-			"samples_48k": 5208220,
-			"samples_native": 3472147,
-			"seconds": 108.50459375
-		},
-		"loop_start": {
-			"samples_48k": 2697264,
-			"samples_native": 1798176,
-			"seconds": 56.193
-		}
-	},
-	"music_edge_works_of_goddess_zababa": {
-		"duration": 91.3029375,
-		"loop_end": {
-			"samples_48k": 4382446,
-			"samples_native": 2921631,
-			"seconds": 91.30096875
-		},
-		"loop_start": {
-			"samples_48k": 1080480,
-			"samples_native": 720320,
-			"seconds": 22.51
-		}
-	},
-	"music_eiai_promise": {
-		"duration": 123.58634375,
-		"loop_end": {
-			"samples_48k": 5932080,
-			"samples_native": 3954720,
-			"seconds": 123.585
-		},
-		"loop_start": {
-			"samples_48k": 1861680,
-			"samples_native": 1241120,
-			"seconds": 38.785
-		}
-	},
-	"music_endless_summertime": {
-		"duration": 122.51665625,
-		"loop_end": {
-			"samples_48k": 5880708,
-			"samples_native": 3920472,
-			"seconds": 122.51475
-		},
-		"loop_start": {
-			"samples_48k": 2393568,
-			"samples_native": 1595712,
-			"seconds": 49.866
-		}
-	},
-	"music_ewigarbunt": {
-		"duration": 94.56709375,
-		"loop_end": {
-			"samples_48k": 4539136,
-			"samples_native": 3026091,
-			"seconds": 94.56534375
-		},
-		"loop_start": {
-			"samples_48k": 532224,
-			"samples_native": 354816,
-			"seconds": 11.088
-		}
-	},
-	"music_first_love_song": {
-		"duration": 104.9476875,
-		"loop_end": {
-			"samples_48k": 5037417,
-			"samples_native": 3358278,
-			"seconds": 104.9461875
-		},
-		"loop_start": {
-			"samples_48k": 585072,
-			"samples_native": 390048,
-			"seconds": 12.189
-		}
-	},
-	"music_flight_feathers": {
-		"duration": 111.38940625,
-		"loop_end": {
-			"samples_48k": 5346628,
-			"samples_native": 3564419,
-			"seconds": 111.38809375
-		},
-		"loop_start": {
-			"samples_48k": 1221216,
-			"samples_native": 814144,
-			"seconds": 25.442
-		}
-	},
-	"music_fushichou_no_flamme": {
-		"duration": 129.0045,
-		"loop_end": {
-			"samples_48k": 6192121,
-			"samples_native": 4128081,
-			"seconds": 129.00253125
-		},
-		"loop_start": {
-			"samples_48k": 2669376,
-			"samples_native": 1779584,
-			"seconds": 55.612
-		}
-	},
-	"music_fuugetsuno_shissou": {
-		"duration": 102.51465625,
-		"loop_end": {
-			"samples_48k": 4920636,
-			"samples_native": 3280424,
-			"seconds": 102.51325
-		},
-		"loop_start": {
-			"samples_48k": 1547376,
-			"samples_native": 1031584,
-			"seconds": 32.237
-		}
-	},
-	"music_gekisou_gungnir": {
-		"duration": 100.545375,
-		"loop_end": {
-			"samples_48k": 4826109,
-			"samples_native": 3217406,
-			"seconds": 100.5439375
-		},
-		"loop_start": {
-			"samples_48k": 1120224,
-			"samples_native": 746816,
-			"seconds": 23.338
-		}
-	},
-	"music_gekisyou_infinity": {
-		"duration": 152.32209375,
-		"loop_end": {
-			"samples_48k": 7311394,
-			"samples_native": 4874263,
-			"seconds": 152.32071875
-		},
-		"loop_start": {
-			"samples_48k": 3361680,
-			"samples_native": 2241120,
-			"seconds": 70.035
-		}
-	},
-	"music_gekkabijin": {
-		"duration": 99.34246875,
-		"loop_end": {
-			"samples_48k": 4768356,
-			"samples_native": 3178904,
-			"seconds": 99.34075
-		},
-		"loop_start": {
-			"samples_48k": 1268592,
-			"samples_native": 845728,
-			"seconds": 26.429
-		}
-	},
-	"music_gekkou_no_tsurugi": {
-		"duration": 86.184875,
-		"loop_end": {
-			"samples_48k": 4136785,
-			"samples_native": 2757857,
-			"seconds": 86.18303125
-		},
-		"loop_start": {
-			"samples_48k": 833472,
-			"samples_native": 555648,
-			"seconds": 17.364
-		}
-	},
-	"music_genkaitoppa_g_beat": {
-		"duration": 121.08309375,
-		"loop_end": {
-			"samples_48k": 5811907,
-			"samples_native": 3874605,
-			"seconds": 121.08140625
-		},
-		"loop_start": {
-			"samples_48k": 1906128,
-			"samples_native": 1270752,
-			"seconds": 39.711
-		}
-	},
-	"music_genocide_saw": {
-		"duration": 95.9691875,
-		"loop_end": {
-			"samples_48k": 4606449,
-			"samples_native": 3070966,
-			"seconds": 95.9676875
-		},
-		"loop_start": {
-			"samples_48k": 1209408,
-			"samples_native": 806272,
-			"seconds": 25.196
-		}
-	},
-	"music_ginwan_airget_lamh": {
-		"duration": 99.313,
-		"loop_end": {
-			"samples_48k": 4766931,
-			"samples_native": 3177954,
-			"seconds": 99.3110625
-		},
-		"loop_start": {
-			"samples_48k": 1055424,
-			"samples_native": 703616,
-			"seconds": 21.988
-		}
-	},
-	"music_glorious_break": {
-		"duration": 165.69746875,
-		"loop_end": {
-			"samples_48k": 7953392,
-			"samples_native": 5302261,
-			"seconds": 165.69565625
-		},
-		"loop_start": {
-			"samples_48k": 4357968,
-			"samples_native": 2905312,
-			"seconds": 90.791
-		}
-	},
-	"music_gohoushi_maidmode": {
-		"duration": 95.612125,
-		"loop_end": {
-			"samples_48k": 4589314,
-			"samples_native": 3059543,
-			"seconds": 95.61071875
-		},
-		"loop_start": {
-			"samples_48k": 1287408,
-			"samples_native": 858272,
-			"seconds": 26.821
-		}
-	},
-	"music_gokuren_igalima": {
-		"duration": 80.25296875,
-		"loop_end": {
-			"samples_48k": 3852064,
-			"samples_native": 2568043,
-			"seconds": 80.25134375
-		},
-		"loop_start": {
-			"samples_48k": 476784,
-			"samples_native": 317856,
-			"seconds": 9.933
-		}
-	},
-	"music_gosenhu_no_sanctuary": {
-		"duration": 92.97546875,
-		"loop_end": {
-			"samples_48k": 4462731,
-			"samples_native": 2975154,
-			"seconds": 92.9735625
-		},
-		"loop_start": {
-			"samples_48k": 1220064,
-			"samples_native": 813376,
-			"seconds": 25.418
-		}
-	},
-	"music_gun_bullet_xxx": {
-		"duration": 83.22640625,
-		"loop_end": {
-			"samples_48k": 3994797,
-			"samples_native": 2663198,
-			"seconds": 83.2249375
-		},
-		"loop_start": {
-			"samples_48k": 117312,
-			"samples_native": 78208,
-			"seconds": 2.444
-		}
-	},
-	"music_gyakkou_no_flugel": {
-		"duration": 114.43875,
-		"loop_end": {
-			"samples_48k": 5492964,
-			"samples_native": 3661976,
-			"seconds": 114.43675
-		},
-		"loop_start": {
-			"samples_48k": 1260816,
-			"samples_native": 840544,
-			"seconds": 26.267
-		}
-	},
-	"music_gyakkou_no_flugel_ver_souyoku": {
-		"duration": 123.3248125,
-		"loop_end": {
-			"samples_48k": 5919507,
-			"samples_native": 3946338,
-			"seconds": 123.3230625
-		},
-		"loop_start": {
-			"samples_48k": 1687440,
-			"samples_native": 1124960,
-			"seconds": 35.155
-		}
-	},
-	"music_gyakkou_no_resolve": {
-		"duration": 111.3798125,
-		"loop_end": {
-			"samples_48k": 5346163,
-			"samples_native": 3564109,
-			"seconds": 111.37840625
-		},
-		"loop_start": {
-			"samples_48k": 1638576,
-			"samples_native": 1092384,
-			"seconds": 34.137
-		}
-	},
-	"music_hadakaninatte_natsu": {
-		"duration": 85.93515625,
-		"loop_end": {
-			"samples_48k": 4124794,
-			"samples_native": 2749863,
-			"seconds": 85.93321875
-		},
-		"loop_start": {
-			"samples_48k": 654768,
-			"samples_native": 436512,
-			"seconds": 13.641
-		}
-	},
-	"music_hajimarino_uta": {
-		"duration": 167.56865625,
-		"loop_end": {
-			"samples_48k": 8043231,
-			"samples_native": 5362154,
-			"seconds": 167.5673125
-		},
-		"loop_start": {
-			"samples_48k": 1400592,
-			"samples_native": 933728,
-			"seconds": 29.179
-		}
-	},
-	"music_hanasaku_yuuki": {
-		"duration": 98.078,
-		"loop_end": {
-			"samples_48k": 4707648,
-			"samples_native": 3138432,
-			"seconds": 98.076
-		},
-		"loop_start": {
-			"samples_48k": 1034160,
-			"samples_native": 689440,
-			"seconds": 21.545
-		}
-	},
-	"music_hanasaku_yuuki2": {
-		"duration": 100.22209375,
-		"loop_end": {
-			"samples_48k": 4810585,
-			"samples_native": 3207057,
-			"seconds": 100.22053125
-		},
-		"loop_start": {
-			"samples_48k": 1139376,
-			"samples_native": 759584,
-			"seconds": 23.737
-		}
-	},
-	"music_hidamari_memoria": {
-		"duration": 107.5283125,
-		"loop_end": {
-			"samples_48k": 5161266,
-			"samples_native": 3440844,
-			"seconds": 107.526375
-		},
-		"loop_start": {
-			"samples_48k": 861504,
-			"samples_native": 574336,
-			"seconds": 17.948
-		}
-	},
-	"music_hitsuai_dyuoshauto": {
-		"duration": 112.36075,
-		"loop_end": {
-			"samples_48k": 5393221,
-			"samples_native": 3595481,
-			"seconds": 112.35878125
-		},
-		"loop_start": {
-			"samples_48k": 1906080,
-			"samples_native": 1270720,
-			"seconds": 39.71
-		}
-	},
-	"music_junpaku_innocent": {
-		"duration": 118.195375,
-		"loop_end": {
-			"samples_48k": 5673310,
-			"samples_native": 3782207,
-			"seconds": 118.19396875
-		},
-		"loop_start": {
-			"samples_48k": 2061216,
-			"samples_native": 1374144,
-			"seconds": 42.942
-		}
-	},
-	"music_kaban_no_kakushigoto": {
-		"duration": 80.6815,
-		"loop_end": {
-			"samples_48k": 3872619,
-			"samples_native": 2581746,
-			"seconds": 80.6795625
-		},
-		"loop_start": {
-			"samples_48k": 544176,
-			"samples_native": 362784,
-			"seconds": 11.337
-		}
-	},
-	"music_kimitoiu_otokanade_tsukirumade": {
-		"duration": 95.7555,
-		"loop_end": {
-			"samples_48k": 4596183,
-			"samples_native": 3064122,
-			"seconds": 95.7538125
-		},
-		"loop_start": {
-			"samples_48k": 845616,
-			"samples_native": 563744,
-			"seconds": 17.617
-		}
-	},
-	"music_knock_out": {
-		"duration": 103.6995625,
-		"loop_end": {
-			"samples_48k": 4977483,
-			"samples_native": 3318322,
-			"seconds": 103.6975625
-		},
-		"loop_start": {
-			"samples_48k": 1095744,
-			"samples_native": 730496,
-			"seconds": 22.828
-		}
-	},
-	"music_koi_no_okehazama": {
-		"duration": 76.1594375,
-		"loop_end": {
-			"samples_48k": 3655587,
-			"samples_native": 2437058,
-			"seconds": 76.1580625
-		},
-		"loop_start": {
-			"samples_48k": 710064,
-			"samples_native": 473376,
-			"seconds": 14.793
-		}
-	},
-	"music_kono_ima_wo_ikite": {
-		"duration": 161.39909375,
-		"loop_end": {
-			"samples_48k": 7747063,
-			"samples_native": 5164709,
-			"seconds": 161.39715625
-		},
-		"loop_start": {
-			"samples_48k": 939792,
-			"samples_native": 626528,
-			"seconds": 19.579
-		}
-	},
-	"music_kousou_gungnir": {
-		"duration": 108.73359375,
-		"loop_end": {
-			"samples_48k": 5219131,
-			"samples_native": 3479421,
-			"seconds": 108.73190625
-		},
-		"loop_start": {
-			"samples_48k": 1184208,
-			"samples_native": 789472,
-			"seconds": 24.671
-		}
-	},
-	"music_kyoushitsu_monochrome": {
-		"duration": 79.831625,
-		"loop_end": {
-			"samples_48k": 3831834,
-			"samples_native": 2554556,
-			"seconds": 79.829875
-		},
-		"loop_start": {
-			"samples_48k": 489168,
-			"samples_native": 326112,
-			"seconds": 10.191
-		}
-	},
-	"music_little_miracle_grip_it_tight": {
-		"duration": 96.00890625,
-		"loop_end": {
-			"samples_48k": 4608354,
-			"samples_native": 3072236,
-			"seconds": 96.007375
-		},
-		"loop_start": {
-			"samples_48k": 1199376,
-			"samples_native": 799584,
-			"seconds": 24.987
-		}
-	},
-	"music_luminous_gate": {
-		"duration": 105.43403125,
-		"loop_end": {
-			"samples_48k": 5060763,
-			"samples_native": 3373842,
-			"seconds": 105.4325625
-		},
-		"loop_start": {
-			"samples_48k": 1741440,
-			"samples_native": 1160960,
-			"seconds": 36.28
-		}
-	},
-	"music_makenaiai_ga_kokoniaru": {
-		"duration": 93.74815625,
-		"loop_end": {
-			"samples_48k": 4499835,
-			"samples_native": 2999890,
-			"seconds": 93.7465625
-		},
-		"loop_start": {
-			"samples_48k": 1334880,
-			"samples_native": 889920,
-			"seconds": 27.81
-		}
-	},
-	"music_makyu_ichiibal": {
-		"duration": 81.071375,
-		"loop_end": {
-			"samples_48k": 3891351,
-			"samples_native": 2594234,
-			"seconds": 81.0698125
-		},
-		"loop_start": {
-			"samples_48k": 650016,
-			"samples_native": 433344,
-			"seconds": 13.542
-		}
-	},
-	"music_melodious_moonlight": {
-		"duration": 99.05025,
-		"loop_end": {
-			"samples_48k": 4754340,
-			"samples_native": 3169560,
-			"seconds": 99.04875
-		},
-		"loop_start": {
-			"samples_48k": 1230576,
-			"samples_native": 820384,
-			"seconds": 25.637
-		}
-	},
-	"music_nijiiro_no_flugel": {
-		"duration": 112.277,
-		"loop_end": {
-			"samples_48k": 5389231,
-			"samples_native": 3592821,
-			"seconds": 112.27565625
-		},
-		"loop_start": {
-			"samples_48k": 1157088,
-			"samples_native": 771392,
-			"seconds": 24.106
-		}
-	},
-	"music_okitegami": {
-		"duration": 100.10028125,
-		"loop_end": {
-			"samples_48k": 4804740,
-			"samples_native": 3203160,
-			"seconds": 100.09875
-		},
-		"loop_start": {
-			"samples_48k": 1280976,
-			"samples_native": 853984,
-			"seconds": 26.687
-		}
-	},
-	"music_orbital_beat": {
-		"duration": 74.67153125,
-		"loop_end": {
-			"samples_48k": 3584140,
-			"samples_native": 2389427,
-			"seconds": 74.66959375
-		},
-		"loop_start": {
-			"samples_48k": 1202976,
-			"samples_native": 801984,
-			"seconds": 25.062
-		}
-	},
-	"music_oukyo_sulsagana": {
-		"duration": 100.1548125,
-		"loop_end": {
-			"samples_48k": 4807359,
-			"samples_native": 3204906,
-			"seconds": 100.1533125
-		},
-		"loop_start": {
-			"samples_48k": 1065168,
-			"samples_native": 710112,
-			"seconds": 22.191
-		}
-	},
-	"music_over_killscythe_hell": {
-		"duration": 91.43084375,
-		"loop_end": {
-			"samples_48k": 4388601,
-			"samples_native": 2925734,
-			"seconds": 91.4291875
-		},
-		"loop_start": {
-			"samples_48k": 1212432,
-			"samples_native": 808288,
-			"seconds": 25.259
-		}
-	},
-	"music_practice_mode": {
-		"duration": 108.994625,
-		"loop_end": {
-			"samples_48k": 5231652,
-			"samples_native": 3487768,
-			"seconds": 108.99275
-		},
-		"loop_start": {
-			"samples_48k": 1314384,
-			"samples_native": 876256,
-			"seconds": 27.383
-		}
-	},
-	"music_rainbow_flower": {
-		"duration": 88.8225,
-		"loop_end": {
-			"samples_48k": 4263411,
-			"samples_native": 2842274,
-			"seconds": 88.8210625
-		},
-		"loop_start": {
-			"samples_48k": 1273728,
-			"samples_native": 849152,
-			"seconds": 26.536
-		}
-	},
-	"music_ressou_gungnir": {
-		"duration": 141.42465625,
-		"loop_end": {
-			"samples_48k": 6788316,
-			"samples_native": 4525544,
-			"seconds": 141.42325
-		},
-		"loop_start": {
-			"samples_48k": 3042432,
-			"samples_native": 2028288,
-			"seconds": 63.384
-		}
-	},
-	"music_sakamaku_keppu": {
-		"duration": 96.219625,
-		"loop_end": {
-			"samples_48k": 4618468,
-			"samples_native": 3078979,
-			"seconds": 96.21809375
-		},
-		"loop_start": {
-			"samples_48k": 1680480,
-			"samples_native": 1120320,
-			"seconds": 35.01
-		}
-	},
-	"music_sakimori_no_uta": {
-		"duration": 100.8615625,
-		"loop_end": {
-			"samples_48k": 4841271,
-			"samples_native": 3227514,
-			"seconds": 100.8598125
-		},
-		"loop_start": {
-			"samples_48k": 1095504,
-			"samples_native": 730336,
-			"seconds": 22.823
-		}
-	},
-	"music_sakura_blizzard": {
-		"duration": 101.234875,
-		"loop_end": {
-			"samples_48k": 4859196,
-			"samples_native": 3239464,
-			"seconds": 101.23325
-		},
-		"loop_start": {
-			"samples_48k": 1204704,
-			"samples_native": 803136,
-			"seconds": 25.098
-		}
-	},
-	"music_santa_ga_machi_ni_yattekuru": {
-		"duration": 104.1534375,
-		"loop_end": {
-			"samples_48k": 4999269,
-			"samples_native": 3332846,
-			"seconds": 104.1514375
-		},
-		"loop_start": {
-			"samples_48k": 662304,
-			"samples_native": 441536,
-			"seconds": 13.798
-		}
-	},
-	"music_seigiwoshinjite_nigirishimete": {
-		"duration": 87.9635625,
-		"loop_end": {
-			"samples_48k": 4222179,
-			"samples_native": 2814786,
-			"seconds": 87.9620625
-		},
-		"loop_start": {
-			"samples_48k": 382512,
-			"samples_native": 255008,
-			"seconds": 7.969
-		}
-	},
-	"music_seiten_galaxy_cross": {
-		"duration": 126.5226875,
-		"loop_end": {
-			"samples_48k": 6073014,
-			"samples_native": 4048676,
-			"seconds": 126.521125
-		},
-		"loop_start": {
-			"samples_48k": 1793712,
-			"samples_native": 1195808,
-			"seconds": 37.369
-		}
-	},
-	"music_senkin_daurudabura": {
-		"duration": 110.1046875,
-		"loop_end": {
-			"samples_48k": 5284932,
-			"samples_native": 3523288,
-			"seconds": 110.10275
-		},
-		"loop_start": {
-			"samples_48k": 1316256,
-			"samples_native": 877504,
-			"seconds": 27.422
-		}
-	},
-	"music_senkin_daurudabura_test01": {
-		"duration": 82.6820625,
-		"loop_end": {
-			"samples_48k": 3968674,
-			"samples_native": 2645783,
-			"seconds": 82.68071875
-		},
-		"loop_start": {
-			"samples_48k": 0,
-			"samples_native": 0,
-			"seconds": 0.0
-		}
-	},
-	"music_senritsu_sorority": {
-		"duration": 162.176125,
-		"loop_end": {
-			"samples_48k": 7784385,
-			"samples_native": 5189590,
-			"seconds": 162.1746875
-		},
-		"loop_start": {
-			"samples_48k": 3414720,
-			"samples_native": 2276480,
-			"seconds": 71.14
-		}
-	},
-	"music_sense_of_distance": {
-		"duration": 115.3528125,
-		"loop_end": {
-			"samples_48k": 5536843,
-			"samples_native": 3691229,
-			"seconds": 115.35090625
-		},
-		"loop_start": {
-			"samples_48k": 2001648,
-			"samples_native": 1334432,
-			"seconds": 41.701
-		}
-	},
-	"music_shinwasekai_karano_kyousyuu": {
-		"duration": 70.55734375,
-		"loop_end": {
-			"samples_48k": 3386688,
-			"samples_native": 2257792,
-			"seconds": 70.556
-		},
-		"loop_start": {
-			"samples_48k": 0,
-			"samples_native": 0,
-			"seconds": 0.0
-		}
-	},
-	"music_shippujinrai": {
-		"duration": 104.2053125,
-		"loop_end": {
-			"samples_48k": 5001786,
-			"samples_native": 3334524,
-			"seconds": 104.203875
-		},
-		"loop_start": {
-			"samples_48k": 1210320,
-			"samples_native": 806880,
-			"seconds": 25.215
-		}
-	},
-	"music_shitou_eibihikaito": {
-		"duration": 151.1798125,
-		"loop_end": {
-			"samples_48k": 7256547,
-			"samples_native": 4837698,
-			"seconds": 151.1780625
-		},
-		"loop_start": {
-			"samples_48k": 2724096,
-			"samples_native": 1816064,
-			"seconds": 56.752
-		}
-	},
-	"music_song_for_the_world": {
-		"duration": 99.87034375,
-		"loop_end": {
-			"samples_48k": 4793701,
-			"samples_native": 3195801,
-			"seconds": 99.86878125
-		},
-		"loop_start": {
-			"samples_48k": 1034544,
-			"samples_native": 689696,
-			"seconds": 21.553
-		}
-	},
-	"music_sorae": {
-		"duration": 128.56625,
-		"loop_end": {
-			"samples_48k": 6171114,
-			"samples_native": 4114076,
-			"seconds": 128.564875
-		},
-		"loop_start": {
-			"samples_48k": 2426880,
-			"samples_native": 1617920,
-			"seconds": 50.56
-		}
-	},
-	"music_souyoku_no_wingbeat": {
-		"duration": 150.00028125,
-		"loop_end": {
-			"samples_48k": 7199934,
-			"samples_native": 4799956,
-			"seconds": 149.998625
-		},
-		"loop_start": {
-			"samples_48k": 3152256,
-			"samples_native": 2101504,
-			"seconds": 65.672
-		}
-	},
-	"music_stand_up_ready": {
-		"duration": 108.51640625,
-		"loop_end": {
-			"samples_48k": 5208702,
-			"samples_native": 3472468,
-			"seconds": 108.514625
-		},
-		"loop_start": {
-			"samples_48k": 1157712,
-			"samples_native": 771808,
-			"seconds": 24.119
-		}
-	},
-	"music_synchrogazer": {
-		"duration": 106.25409375,
-		"loop_end": {
-			"samples_48k": 5100102,
-			"samples_native": 3400068,
-			"seconds": 106.252125
-		},
-		"loop_start": {
-			"samples_48k": 1187760,
-			"samples_native": 791840,
-			"seconds": 24.745
-		}
-	},
-	"music_tegami": {
-		"duration": 79.045,
-		"loop_end": {
-			"samples_48k": 3794065,
-			"samples_native": 2529377,
-			"seconds": 79.04303125
-		},
-		"loop_start": {
-			"samples_48k": 897552,
-			"samples_native": 598368,
-			"seconds": 18.699
-		}
-	},
-	"music_the_moon_is_a_harsh_mistress": {
-		"duration": 96.8825,
-		"loop_end": {
-			"samples_48k": 4650280,
-			"samples_native": 3100187,
-			"seconds": 96.88084375
-		},
-		"loop_start": {
-			"samples_48k": 1302096,
-			"samples_native": 868064,
-			"seconds": 27.127
-		}
-	},
-	"music_the_wild_bunch": {
-		"duration": 75.24625,
-		"loop_end": {
-			"samples_48k": 3611754,
-			"samples_native": 2407836,
-			"seconds": 75.244875
-		},
-		"loop_start": {
-			"samples_48k": 1120944,
-			"samples_native": 747296,
-			"seconds": 23.353
-		}
-	},
-	"music_trust_heart": {
-		"duration": 90.5468125,
-		"loop_end": {
-			"samples_48k": 4346170,
-			"samples_native": 2897447,
-			"seconds": 90.54521875
-		},
-		"loop_start": {
-			"samples_48k": 1176384,
-			"samples_native": 784256,
-			"seconds": 24.508
-		}
-	},
-	"music_tsunaida_tedakega_tsunagumono": {
-		"duration": 88.55775,
-		"loop_end": {
-			"samples_48k": 4250697,
-			"samples_native": 2833798,
-			"seconds": 88.5561875
-		},
-		"loop_start": {
-			"samples_48k": 731760,
-			"samples_native": 487840,
-			"seconds": 15.245
-		}
-	},
-	"music_union": {
-		"duration": 84.9683125,
-		"loop_end": {
-			"samples_48k": 4078393,
-			"samples_native": 2718929,
-			"seconds": 84.96653125
-		},
-		"loop_start": {
-			"samples_48k": 841344,
-			"samples_native": 560896,
-			"seconds": 17.528
-		}
-	},
-	"music_vitalization": {
-		"duration": 96.31796875,
-		"loop_end": {
-			"samples_48k": 4623187,
-			"samples_native": 3082125,
-			"seconds": 96.31640625
-		},
-		"loop_start": {
-			"samples_48k": 1773504,
-			"samples_native": 1182336,
-			"seconds": 36.948
-		}
-	},
-	"music_waikyou_shenshoujin": {
-		"duration": 117.59053125,
-		"loop_end": {
-			"samples_48k": 5644249,
-			"samples_native": 3762833,
-			"seconds": 117.58853125
-		},
-		"loop_start": {
-			"samples_48k": 1612608,
-			"samples_native": 1075072,
-			"seconds": 33.596
-		}
-	},
-	"music_watashitoiu_otohibiki_sonosakini": {
-		"duration": 93.04259375,
-		"loop_end": {
-			"samples_48k": 4465980,
-			"samples_native": 2977320,
-			"seconds": 93.04125
-		},
-		"loop_start": {
-			"samples_48k": 716208,
-			"samples_native": 477472,
-			"seconds": 14.921
-		}
-	},
-	"music_zettou_amenohabakiri": {
-		"duration": 113.1419375,
-		"loop_end": {
-			"samples_48k": 5430724,
-			"samples_native": 3620483,
-			"seconds": 113.14009375
-		},
-		"loop_start": {
-			"samples_48k": 1179312,
-			"samples_native": 786208,
-			"seconds": 24.569
-		}
-	}
-}
\ No newline at end of file
diff --git a/Js/UtageParse.js b/Js/UtageParse.js
index 227d41e..3efa61e 100644
--- a/Js/UtageParse.js
+++ b/Js/UtageParse.js
@@ -36,7 +36,7 @@ class UtageInfo {
 				//commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Settings/Scenario.tsv`),
 				commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Settings/Sound.tsv`), //5
 				commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Settings/Texture.tsv`), //6
-				commonFunctions.getFileJson(`${this.rootDirectory}Js/BgmLoop.json`), //7
+				commonFunctions.getFileJson(`${this.rootDirectory}XDUData/Bgm/BgmLoop.json`), //7
 				commonFunctions.getFileJson(`${this.rootDirectory}Js/Translations/XduQuestCustom.json`), //8
 				commonFunctions.getFileJson(`${this.rootDirectory}Js/Translations/XduSceneCustom.json`), //9
 				commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomCharacter.tsv`), //10
diff --git a/gulpfile.js b/gulpfile.js
index 8324029..0154913 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -26,9 +26,6 @@ const cssToCopy = [
 "Css/main.min.css",
 "Css/generic.min.css"
 ];
-const jsonFiles = [
-"Js/BgmLoop.json",
-];
 const translations = [
 "Js/Translations/**"
 ];
@@ -50,7 +47,6 @@ gulp.task('dist', gulp.series(
 				buildCss,
 				copyCss
 			),
-			buildJson,
 			buildJsonTranslations,
 			copyHtml,
 			copyImages,
@@ -117,12 +113,6 @@ function copyCustomData() {
 		.pipe(gulp.dest('Dist/CustomData'));
 }
 
-function buildJson() {
-	return gulp.src(jsonFiles)
-        .pipe(jsonmin())
-        .pipe(gulp.dest('Dist/Js'));
-}
-
 function buildJsonTranslations() {
 	return gulp.src(translations)
         .pipe(jsonmin())

From 89a93407f1c6538c84ccee9909a9cf1751e2e11a Mon Sep 17 00:00:00 2001
From: louis <heicrd@cock.li>
Date: Tue, 18 Feb 2020 18:17:51 -0500
Subject: [PATCH 2/7] Update repository links for submodules and player info

---
 .gitmodules | 4 ++--
 Js/Main.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index bd25379..1cfb4e8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "Js/Translations"]
 	path = Js/Translations
-	url = https://git.poweris.moe/xdutranslations.git
+	url = https://git.poweris.moe/yttt-xdu/xdutranslations.git
 	branch = .
 [submodule "CustomData"]
 	path = CustomData
-	url = https://git.poweris.moe/customdata.git
+	url = https://git.poweris.moe/yttt-xdu/customdata.git
 	branch = .
diff --git a/Js/Main.js b/Js/Main.js
index 2db155c..60389ab 100644
--- a/Js/Main.js
+++ b/Js/Main.js
@@ -543,7 +543,7 @@ function openHelpModal(event) {
 		<div style="margin-top: auto; text-align: center;">All Symphogear content belongs to its respective owners</div>
 		<div id="modal-buttons">
 			<button onclick="closeModal(event)">Close</button>
-			<a href="https://git.poweris.moe/xduplayer.git/" target="_blank">Source</a>
+			<a href="https://git.poweris.moe/yttt-xdu/XDUPlayer" target="_blank">Source</a>
 		</div>
 	</div>`;
 	document.getElementById("click-catcher").style.cssText = 'display: flex;';

From 90236c665dea981efdbba9897e06aa5ad174c779 Mon Sep 17 00:00:00 2001
From: firebingo <matthew.t.kides@gmail.com>
Date: Fri, 17 Apr 2020 14:26:12 -0700
Subject: [PATCH 3/7] Since we dont have battles we use "divaeffectcontinue" as
 a fade out but they also sometimes call "fadeout" so set a flag so we don't
 do fade out again if we are already doing it.

---
 Js/Player.js    | 5 +++++
 Js/Translations | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Js/Player.js b/Js/Player.js
index 8a6aa1d..99ab45e 100644
--- a/Js/Player.js
+++ b/Js/Player.js
@@ -27,6 +27,7 @@ class Player {
 		this.waitTime = 0;
 		this.manualNext = false;
 		this.hasMoreText = false;
+		this.hasFadedOut = false;
 		this.uiHidden = false;
 		this.center = {x: ((baseDimensions.width / 2) * this.resolutionScale), y: ((baseDimensions.height / 2) * this.resolutionScale) };
 		this.assetLoadPercent = 0;
@@ -504,6 +505,8 @@ class Player {
 				//FadeTo
 				case "divaeffectcontinue":
 				case "fadeout": {
+					if(this.hasFadedOut) { break; }
+					this.hasFadedOut = true;
 					if(cur.Command.toLowerCase() === "divaeffectcontinue") {
 						cur.Arg1 = 'black';
 						cur.Arg6 = 1;
@@ -520,6 +523,7 @@ class Player {
 				}
 				//FadeFrom
 				case "fadein": {
+					this.hasFadedOut = false;
 					this.waitTime = Number(cur.Arg6) * 1000;
 					if(!cur.Arg1)
 						cur.Arg1 = 'white';
@@ -1378,6 +1382,7 @@ class Player {
 				this.lerpTargets = [];
 				this.manualNext = false;
 				this.hasMoreText = false;
+				this.hasFadedOut = false;
 				this.audioLoadPercent = 0;
 				this.assetLoadPercent = 0;
 				this.playingVoice = undefined;
diff --git a/Js/Translations b/Js/Translations
index c8e9be4..ac0bfbd 160000
--- a/Js/Translations
+++ b/Js/Translations
@@ -1 +1 @@
-Subproject commit c8e9be400b68111bd1abfb879205e2f07d91d1a5
+Subproject commit ac0bfbd699431e9befdd843379e7c91ad1014cec

From 47e250ba893c355042deb3dac7491be1bbe31711 Mon Sep 17 00:00:00 2001
From: argoneus <argoneus@poweris.moe>
Date: Sat, 16 May 2020 15:39:41 +0200
Subject: [PATCH 4/7] support for global languages

---
 Js/Main.js        |    2 +-
 Js/Translations   |    2 +-
 package-lock.json | 3301 +++++++++++++++++++++++----------------------
 3 files changed, 1662 insertions(+), 1643 deletions(-)

diff --git a/Js/Main.js b/Js/Main.js
index 60389ab..ccf8202 100644
--- a/Js/Main.js
+++ b/Js/Main.js
@@ -10,7 +10,7 @@ const shaders = new Shaders();
 const textFunc = new TextFunctions();
 let audio = undefined; //Cant create a audio context without user input.
 const player = new Player(pixiApp, utage, textFunc, audio, shaders);
-const languages = ["eng", "jpn", "rus"];
+const languages = ["eng", "jpn", "rus", "enm", "kor", "zho"];
 const version = "YameteTomete XDUPlayer V1.4.0";
 let bodyLoaded = false;
 let utageLoaded = false;
diff --git a/Js/Translations b/Js/Translations
index ac0bfbd..178ec9b 160000
--- a/Js/Translations
+++ b/Js/Translations
@@ -1 +1 @@
-Subproject commit ac0bfbd699431e9befdd843379e7c91ad1014cec
+Subproject commit 178ec9be36f504418d6aae0bb099d5006bd4186a
diff --git a/package-lock.json b/package-lock.json
index 187cc79..f412960 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
 			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
 			"dev": true,
 			"requires": {
-				"@babel/highlight": "7.0.0"
+				"@babel/highlight": "^7.0.0"
 			}
 		},
 		"@babel/highlight": {
@@ -19,9 +19,9 @@
 			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
 			"dev": true,
 			"requires": {
-				"chalk": "2.4.2",
-				"esutils": "2.0.2",
-				"js-tokens": "4.0.0"
+				"chalk": "^2.0.0",
+				"esutils": "^2.0.2",
+				"js-tokens": "^4.0.0"
 			}
 		},
 		"@gulp-sourcemaps/identity-map": {
@@ -30,11 +30,11 @@
 			"integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
 			"dev": true,
 			"requires": {
-				"acorn": "5.7.3",
-				"css": "2.2.4",
-				"normalize-path": "2.1.1",
-				"source-map": "0.6.1",
-				"through2": "2.0.5"
+				"acorn": "^5.0.3",
+				"css": "^2.2.1",
+				"normalize-path": "^2.1.1",
+				"source-map": "^0.6.0",
+				"through2": "^2.0.3"
 			},
 			"dependencies": {
 				"acorn": {
@@ -57,8 +57,8 @@
 			"integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
 			"dev": true,
 			"requires": {
-				"normalize-path": "2.1.1",
-				"through2": "2.0.5"
+				"normalize-path": "^2.0.1",
+				"through2": "^2.0.3"
 			}
 		},
 		"acorn": {
@@ -79,10 +79,10 @@
 			"integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
 			"dev": true,
 			"requires": {
-				"fast-deep-equal": "2.0.1",
-				"fast-json-stable-stringify": "2.0.0",
-				"json-schema-traverse": "0.4.1",
-				"uri-js": "4.2.2"
+				"fast-deep-equal": "^2.0.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
 			}
 		},
 		"amdefine": {
@@ -97,7 +97,7 @@
 			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
 			"dev": true,
 			"requires": {
-				"ansi-wrap": "0.1.0"
+				"ansi-wrap": "^0.1.0"
 			}
 		},
 		"ansi-cyan": {
@@ -145,7 +145,7 @@
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 			"dev": true,
 			"requires": {
-				"color-convert": "1.9.3"
+				"color-convert": "^1.9.0"
 			}
 		},
 		"ansi-wrap": {
@@ -160,8 +160,8 @@
 			"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
 			"dev": true,
 			"requires": {
-				"micromatch": "3.1.10",
-				"normalize-path": "2.1.1"
+				"micromatch": "^3.1.4",
+				"normalize-path": "^2.1.1"
 			}
 		},
 		"append-buffer": {
@@ -170,7 +170,7 @@
 			"integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
 			"dev": true,
 			"requires": {
-				"buffer-equal": "1.0.0"
+				"buffer-equal": "^1.0.0"
 			}
 		},
 		"archy": {
@@ -185,7 +185,7 @@
 			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 			"dev": true,
 			"requires": {
-				"sprintf-js": "1.0.3"
+				"sprintf-js": "~1.0.2"
 			}
 		},
 		"arr-diff": {
@@ -200,7 +200,7 @@
 			"integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
 			"dev": true,
 			"requires": {
-				"make-iterator": "1.0.1"
+				"make-iterator": "^1.0.0"
 			}
 		},
 		"arr-flatten": {
@@ -215,7 +215,7 @@
 			"integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
 			"dev": true,
 			"requires": {
-				"make-iterator": "1.0.1"
+				"make-iterator": "^1.0.0"
 			}
 		},
 		"arr-union": {
@@ -242,8 +242,8 @@
 			"integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
 			"dev": true,
 			"requires": {
-				"array-slice": "1.1.0",
-				"is-number": "4.0.0"
+				"array-slice": "^1.0.0",
+				"is-number": "^4.0.0"
 			},
 			"dependencies": {
 				"is-number": {
@@ -260,7 +260,7 @@
 			"integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
 			"dev": true,
 			"requires": {
-				"is-number": "4.0.0"
+				"is-number": "^4.0.0"
 			},
 			"dependencies": {
 				"is-number": {
@@ -283,9 +283,9 @@
 			"integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
 			"dev": true,
 			"requires": {
-				"default-compare": "1.0.0",
-				"get-value": "2.0.6",
-				"kind-of": "5.1.0"
+				"default-compare": "^1.0.0",
+				"get-value": "^2.0.6",
+				"kind-of": "^5.0.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -320,10 +320,10 @@
 			"integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==",
 			"dev": true,
 			"requires": {
-				"end-of-stream": "1.4.1",
-				"once": "1.4.0",
-				"process-nextick-args": "1.0.7",
-				"stream-exhaust": "1.0.2"
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.2",
+				"process-nextick-args": "^1.0.7",
+				"stream-exhaust": "^1.0.1"
 			}
 		},
 		"async-each": {
@@ -338,7 +338,7 @@
 			"integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
 			"dev": true,
 			"requires": {
-				"async-done": "1.3.1"
+				"async-done": "^1.2.2"
 			}
 		},
 		"atob": {
@@ -353,15 +353,15 @@
 			"integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
 			"dev": true,
 			"requires": {
-				"arr-filter": "1.1.2",
-				"arr-flatten": "1.1.0",
-				"arr-map": "2.0.2",
-				"array-each": "1.0.1",
-				"array-initial": "1.1.0",
-				"array-last": "1.3.0",
-				"async-done": "1.3.1",
-				"async-settle": "1.0.0",
-				"now-and-later": "2.0.1"
+				"arr-filter": "^1.1.1",
+				"arr-flatten": "^1.0.1",
+				"arr-map": "^2.0.0",
+				"array-each": "^1.0.0",
+				"array-initial": "^1.0.0",
+				"array-last": "^1.1.1",
+				"async-done": "^1.2.2",
+				"async-settle": "^1.0.0",
+				"now-and-later": "^2.0.0"
 			}
 		},
 		"balanced-match": {
@@ -376,13 +376,13 @@
 			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
 			"dev": true,
 			"requires": {
-				"cache-base": "1.0.1",
-				"class-utils": "0.3.6",
-				"component-emitter": "1.3.0",
-				"define-property": "1.0.0",
-				"isobject": "3.0.1",
-				"mixin-deep": "1.3.1",
-				"pascalcase": "0.1.1"
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
 			},
 			"dependencies": {
 				"define-property": {
@@ -391,7 +391,7 @@
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "1.0.2"
+						"is-descriptor": "^1.0.0"
 					}
 				},
 				"is-accessor-descriptor": {
@@ -400,7 +400,7 @@
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "6.0.2"
+						"kind-of": "^6.0.0"
 					}
 				},
 				"is-data-descriptor": {
@@ -409,7 +409,7 @@
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "6.0.2"
+						"kind-of": "^6.0.0"
 					}
 				},
 				"is-descriptor": {
@@ -418,9 +418,9 @@
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "1.0.0",
-						"is-data-descriptor": "1.0.0",
-						"kind-of": "6.0.2"
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
 				}
 			}
@@ -437,7 +437,7 @@
 			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
 			"requires": {
-				"balanced-match": "1.0.0",
+				"balanced-match": "^1.0.0",
 				"concat-map": "0.0.1"
 			}
 		},
@@ -447,16 +447,16 @@
 			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
 			"dev": true,
 			"requires": {
-				"arr-flatten": "1.1.0",
-				"array-unique": "0.3.2",
-				"extend-shallow": "2.0.1",
-				"fill-range": "4.0.0",
-				"isobject": "3.0.1",
-				"repeat-element": "1.1.3",
-				"snapdragon": "0.8.2",
-				"snapdragon-node": "2.1.1",
-				"split-string": "3.1.0",
-				"to-regex": "3.0.2"
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
 			},
 			"dependencies": {
 				"extend-shallow": {
@@ -465,7 +465,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "0.1.1"
+						"is-extendable": "^0.1.0"
 					}
 				}
 			}
@@ -488,15 +488,15 @@
 			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
 			"dev": true,
 			"requires": {
-				"collection-visit": "1.0.0",
-				"component-emitter": "1.3.0",
-				"get-value": "2.0.6",
-				"has-value": "1.0.0",
-				"isobject": "3.0.1",
-				"set-value": "2.0.0",
-				"to-object-path": "0.3.0",
-				"union-value": "1.0.0",
-				"unset-value": "1.0.0"
+				"collection-visit": "^1.0.0",
+				"component-emitter": "^1.2.1",
+				"get-value": "^2.0.6",
+				"has-value": "^1.0.0",
+				"isobject": "^3.0.1",
+				"set-value": "^2.0.0",
+				"to-object-path": "^0.3.0",
+				"union-value": "^1.0.0",
+				"unset-value": "^1.0.0"
 			}
 		},
 		"callsites": {
@@ -517,8 +517,8 @@
 			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
 			"dev": true,
 			"requires": {
-				"camelcase": "2.1.1",
-				"map-obj": "1.0.1"
+				"camelcase": "^2.0.0",
+				"map-obj": "^1.0.0"
 			},
 			"dependencies": {
 				"camelcase": {
@@ -535,9 +535,9 @@
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "3.2.1",
-				"escape-string-regexp": "1.0.5",
-				"supports-color": "5.5.0"
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
 			}
 		},
 		"chardet": {
@@ -552,18 +552,18 @@
 			"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 			"dev": true,
 			"requires": {
-				"anymatch": "2.0.0",
-				"async-each": "1.0.3",
-				"braces": "2.3.2",
-				"fsevents": "1.2.9",
-				"glob-parent": "3.1.0",
-				"inherits": "2.0.3",
-				"is-binary-path": "1.0.1",
-				"is-glob": "4.0.1",
-				"normalize-path": "3.0.0",
-				"path-is-absolute": "1.0.1",
-				"readdirp": "2.2.1",
-				"upath": "1.1.2"
+				"anymatch": "^2.0.0",
+				"async-each": "^1.0.1",
+				"braces": "^2.3.2",
+				"fsevents": "^1.2.7",
+				"glob-parent": "^3.1.0",
+				"inherits": "^2.0.3",
+				"is-binary-path": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"normalize-path": "^3.0.0",
+				"path-is-absolute": "^1.0.0",
+				"readdirp": "^2.2.1",
+				"upath": "^1.1.1"
 			},
 			"dependencies": {
 				"normalize-path": {
@@ -580,10 +580,10 @@
 			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
 			"dev": true,
 			"requires": {
-				"arr-union": "3.1.0",
-				"define-property": "0.2.5",
-				"isobject": "3.0.1",
-				"static-extend": "0.1.2"
+				"arr-union": "^3.1.0",
+				"define-property": "^0.2.5",
+				"isobject": "^3.0.0",
+				"static-extend": "^0.1.1"
 			},
 			"dependencies": {
 				"define-property": {
@@ -592,7 +592,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "0.1.6"
+						"is-descriptor": "^0.1.0"
 					}
 				}
 			}
@@ -603,8 +603,8 @@
 			"integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
 			"dev": true,
 			"requires": {
-				"commander": "2.8.1",
-				"source-map": "0.4.4"
+				"commander": "2.8.x",
+				"source-map": "0.4.x"
 			},
 			"dependencies": {
 				"source-map": {
@@ -613,7 +613,7 @@
 					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
 					"dev": true,
 					"requires": {
-						"amdefine": "1.0.1"
+						"amdefine": ">=0.0.4"
 					}
 				}
 			}
@@ -624,7 +624,7 @@
 			"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
 			"dev": true,
 			"requires": {
-				"restore-cursor": "2.0.0"
+				"restore-cursor": "^2.0.0"
 			}
 		},
 		"cli-width": {
@@ -639,9 +639,9 @@
 			"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
 			"dev": true,
 			"requires": {
-				"string-width": "1.0.2",
-				"strip-ansi": "3.0.1",
-				"wrap-ansi": "2.1.0"
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1",
+				"wrap-ansi": "^2.0.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -656,7 +656,7 @@
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"requires": {
-						"number-is-nan": "1.0.1"
+						"number-is-nan": "^1.0.0"
 					}
 				},
 				"string-width": {
@@ -665,9 +665,9 @@
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"dev": true,
 					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
 					}
 				},
 				"strip-ansi": {
@@ -676,7 +676,7 @@
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "2.1.1"
+						"ansi-regex": "^2.0.0"
 					}
 				}
 			}
@@ -705,9 +705,9 @@
 			"integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
 			"dev": true,
 			"requires": {
-				"inherits": "2.0.3",
-				"process-nextick-args": "2.0.0",
-				"readable-stream": "2.3.6"
+				"inherits": "^2.0.1",
+				"process-nextick-args": "^2.0.0",
+				"readable-stream": "^2.3.5"
 			},
 			"dependencies": {
 				"process-nextick-args": {
@@ -730,9 +730,9 @@
 			"integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
 			"dev": true,
 			"requires": {
-				"arr-map": "2.0.2",
-				"for-own": "1.0.0",
-				"make-iterator": "1.0.1"
+				"arr-map": "^2.0.2",
+				"for-own": "^1.0.0",
+				"make-iterator": "^1.0.0"
 			}
 		},
 		"collection-visit": {
@@ -741,8 +741,8 @@
 			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
 			"dev": true,
 			"requires": {
-				"map-visit": "1.0.0",
-				"object-visit": "1.0.1"
+				"map-visit": "^1.0.0",
+				"object-visit": "^1.0.0"
 			}
 		},
 		"color-convert": {
@@ -772,7 +772,7 @@
 			"integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
 			"dev": true,
 			"requires": {
-				"graceful-readlink": "1.0.1"
+				"graceful-readlink": ">= 1.0.0"
 			}
 		},
 		"component-emitter": {
@@ -793,10 +793,10 @@
 			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
 			"dev": true,
 			"requires": {
-				"buffer-from": "1.1.1",
-				"inherits": "2.0.3",
-				"readable-stream": "2.3.6",
-				"typedarray": "0.0.6"
+				"buffer-from": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.2.2",
+				"typedarray": "^0.0.6"
 			}
 		},
 		"concat-with-sourcemaps": {
@@ -805,7 +805,7 @@
 			"integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
 			"dev": true,
 			"requires": {
-				"source-map": "0.6.1"
+				"source-map": "^0.6.1"
 			},
 			"dependencies": {
 				"source-map": {
@@ -822,7 +822,7 @@
 			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "5.1.2"
+				"safe-buffer": "~5.1.1"
 			}
 		},
 		"copy-descriptor": {
@@ -837,8 +837,8 @@
 			"integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
 			"dev": true,
 			"requires": {
-				"each-props": "1.3.2",
-				"is-plain-object": "2.0.4"
+				"each-props": "^1.3.0",
+				"is-plain-object": "^2.0.1"
 			}
 		},
 		"core-util-is": {
@@ -853,11 +853,11 @@
 			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
 			"dev": true,
 			"requires": {
-				"nice-try": "1.0.5",
-				"path-key": "2.0.1",
-				"semver": "5.7.0",
-				"shebang-command": "1.2.0",
-				"which": "1.3.1"
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
 			}
 		},
 		"css": {
@@ -866,10 +866,10 @@
 			"integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
 			"dev": true,
 			"requires": {
-				"inherits": "2.0.3",
-				"source-map": "0.6.1",
-				"source-map-resolve": "0.5.2",
-				"urix": "0.1.0"
+				"inherits": "^2.0.3",
+				"source-map": "^0.6.1",
+				"source-map-resolve": "^0.5.2",
+				"urix": "^0.1.0"
 			},
 			"dependencies": {
 				"source-map": {
@@ -886,7 +886,7 @@
 			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
 			"dev": true,
 			"requires": {
-				"array-find-index": "1.0.2"
+				"array-find-index": "^1.0.1"
 			}
 		},
 		"d": {
@@ -895,7 +895,7 @@
 			"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
 			"dev": true,
 			"requires": {
-				"es5-ext": "0.10.50"
+				"es5-ext": "^0.10.9"
 			}
 		},
 		"dateformat": {
@@ -904,8 +904,8 @@
 			"integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
 			"dev": true,
 			"requires": {
-				"get-stdin": "4.0.1",
-				"meow": "3.7.0"
+				"get-stdin": "^4.0.1",
+				"meow": "^3.3.0"
 			}
 		},
 		"debug": {
@@ -914,7 +914,7 @@
 			"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 			"dev": true,
 			"requires": {
-				"ms": "2.1.1"
+				"ms": "^2.1.1"
 			}
 		},
 		"debug-fabulous": {
@@ -923,9 +923,9 @@
 			"integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
 			"dev": true,
 			"requires": {
-				"debug": "3.2.6",
-				"memoizee": "0.4.14",
-				"object-assign": "4.1.1"
+				"debug": "3.X",
+				"memoizee": "0.4.X",
+				"object-assign": "4.X"
 			},
 			"dependencies": {
 				"debug": {
@@ -934,7 +934,7 @@
 					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
 					"requires": {
-						"ms": "2.1.1"
+						"ms": "^2.1.1"
 					}
 				}
 			}
@@ -963,7 +963,7 @@
 			"integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
 			"dev": true,
 			"requires": {
-				"kind-of": "5.1.0"
+				"kind-of": "^5.0.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -986,7 +986,7 @@
 			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
 			"dev": true,
 			"requires": {
-				"object-keys": "1.1.1"
+				"object-keys": "^1.0.12"
 			}
 		},
 		"define-property": {
@@ -995,8 +995,8 @@
 			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
 			"dev": true,
 			"requires": {
-				"is-descriptor": "1.0.2",
-				"isobject": "3.0.1"
+				"is-descriptor": "^1.0.2",
+				"isobject": "^3.0.1"
 			},
 			"dependencies": {
 				"is-accessor-descriptor": {
@@ -1005,7 +1005,7 @@
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "6.0.2"
+						"kind-of": "^6.0.0"
 					}
 				},
 				"is-data-descriptor": {
@@ -1014,7 +1014,7 @@
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "6.0.2"
+						"kind-of": "^6.0.0"
 					}
 				},
 				"is-descriptor": {
@@ -1023,9 +1023,9 @@
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "1.0.0",
-						"is-data-descriptor": "1.0.0",
-						"kind-of": "6.0.2"
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
 				}
 			}
@@ -1048,7 +1048,7 @@
 			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
 			"dev": true,
 			"requires": {
-				"esutils": "2.0.2"
+				"esutils": "^2.0.2"
 			}
 		},
 		"duplexer2": {
@@ -1057,7 +1057,7 @@
 			"integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
 			"dev": true,
 			"requires": {
-				"readable-stream": "1.1.14"
+				"readable-stream": "~1.1.9"
 			},
 			"dependencies": {
 				"isarray": {
@@ -1072,10 +1072,10 @@
 					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"dev": true,
 					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
 						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
+						"string_decoder": "~0.10.x"
 					}
 				},
 				"string_decoder": {
@@ -1092,10 +1092,10 @@
 			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
 			"dev": true,
 			"requires": {
-				"end-of-stream": "1.4.1",
-				"inherits": "2.0.3",
-				"readable-stream": "2.3.6",
-				"stream-shift": "1.0.0"
+				"end-of-stream": "^1.0.0",
+				"inherits": "^2.0.1",
+				"readable-stream": "^2.0.0",
+				"stream-shift": "^1.0.0"
 			}
 		},
 		"each-props": {
@@ -1104,8 +1104,8 @@
 			"integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
 			"dev": true,
 			"requires": {
-				"is-plain-object": "2.0.4",
-				"object.defaults": "1.1.0"
+				"is-plain-object": "^2.0.1",
+				"object.defaults": "^1.1.0"
 			}
 		},
 		"emoji-regex": {
@@ -1120,7 +1120,7 @@
 			"integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
 			"dev": true,
 			"requires": {
-				"once": "1.4.0"
+				"once": "^1.4.0"
 			}
 		},
 		"error-ex": {
@@ -1129,7 +1129,7 @@
 			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
 			"dev": true,
 			"requires": {
-				"is-arrayish": "0.2.1"
+				"is-arrayish": "^0.2.1"
 			}
 		},
 		"es5-ext": {
@@ -1138,9 +1138,9 @@
 			"integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
 			"dev": true,
 			"requires": {
-				"es6-iterator": "2.0.3",
-				"es6-symbol": "3.1.1",
-				"next-tick": "1.0.0"
+				"es6-iterator": "~2.0.3",
+				"es6-symbol": "~3.1.1",
+				"next-tick": "^1.0.0"
 			}
 		},
 		"es6-iterator": {
@@ -1149,9 +1149,9 @@
 			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
 			"dev": true,
 			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.50",
-				"es6-symbol": "3.1.1"
+				"d": "1",
+				"es5-ext": "^0.10.35",
+				"es6-symbol": "^3.1.1"
 			}
 		},
 		"es6-symbol": {
@@ -1160,8 +1160,8 @@
 			"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
 			"dev": true,
 			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.50"
+				"d": "1",
+				"es5-ext": "~0.10.14"
 			}
 		},
 		"es6-weak-map": {
@@ -1170,10 +1170,10 @@
 			"integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
 			"dev": true,
 			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.50",
-				"es6-iterator": "2.0.3",
-				"es6-symbol": "3.1.1"
+				"d": "1",
+				"es5-ext": "^0.10.14",
+				"es6-iterator": "^2.0.1",
+				"es6-symbol": "^3.1.1"
 			}
 		},
 		"escape-string-regexp": {
@@ -1188,42 +1188,42 @@
 			"integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "7.0.0",
-				"ajv": "6.10.0",
-				"chalk": "2.4.2",
-				"cross-spawn": "6.0.5",
-				"debug": "4.1.1",
-				"doctrine": "3.0.0",
-				"eslint-scope": "4.0.3",
-				"eslint-utils": "1.3.1",
-				"eslint-visitor-keys": "1.0.0",
-				"espree": "5.0.1",
-				"esquery": "1.0.1",
-				"esutils": "2.0.2",
-				"file-entry-cache": "5.0.1",
-				"functional-red-black-tree": "1.0.1",
-				"glob": "7.1.4",
-				"globals": "11.12.0",
-				"ignore": "4.0.6",
-				"import-fresh": "3.0.0",
-				"imurmurhash": "0.1.4",
-				"inquirer": "6.3.1",
-				"js-yaml": "3.13.1",
-				"json-stable-stringify-without-jsonify": "1.0.1",
-				"levn": "0.3.0",
-				"lodash": "4.17.11",
-				"minimatch": "3.0.4",
-				"mkdirp": "0.5.1",
-				"natural-compare": "1.4.0",
-				"optionator": "0.8.2",
-				"path-is-inside": "1.0.2",
-				"progress": "2.0.3",
-				"regexpp": "2.0.1",
-				"semver": "5.7.0",
-				"strip-ansi": "4.0.0",
-				"strip-json-comments": "2.0.1",
-				"table": "5.3.3",
-				"text-table": "0.2.0"
+				"@babel/code-frame": "^7.0.0",
+				"ajv": "^6.9.1",
+				"chalk": "^2.1.0",
+				"cross-spawn": "^6.0.5",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"eslint-scope": "^4.0.3",
+				"eslint-utils": "^1.3.1",
+				"eslint-visitor-keys": "^1.0.0",
+				"espree": "^5.0.1",
+				"esquery": "^1.0.1",
+				"esutils": "^2.0.2",
+				"file-entry-cache": "^5.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob": "^7.1.2",
+				"globals": "^11.7.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"inquirer": "^6.2.2",
+				"js-yaml": "^3.13.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.3.0",
+				"lodash": "^4.17.11",
+				"minimatch": "^3.0.4",
+				"mkdirp": "^0.5.1",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.8.2",
+				"path-is-inside": "^1.0.2",
+				"progress": "^2.0.0",
+				"regexpp": "^2.0.1",
+				"semver": "^5.5.1",
+				"strip-ansi": "^4.0.0",
+				"strip-json-comments": "^2.0.1",
+				"table": "^5.2.3",
+				"text-table": "^0.2.0"
 			}
 		},
 		"eslint-scope": {
@@ -1232,8 +1232,8 @@
 			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
 			"dev": true,
 			"requires": {
-				"esrecurse": "4.2.1",
-				"estraverse": "4.2.0"
+				"esrecurse": "^4.1.0",
+				"estraverse": "^4.1.1"
 			}
 		},
 		"eslint-utils": {
@@ -1254,9 +1254,9 @@
 			"integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
 			"dev": true,
 			"requires": {
-				"acorn": "6.1.1",
-				"acorn-jsx": "5.0.1",
-				"eslint-visitor-keys": "1.0.0"
+				"acorn": "^6.0.7",
+				"acorn-jsx": "^5.0.0",
+				"eslint-visitor-keys": "^1.0.0"
 			}
 		},
 		"esprima": {
@@ -1271,7 +1271,7 @@
 			"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
 			"dev": true,
 			"requires": {
-				"estraverse": "4.2.0"
+				"estraverse": "^4.0.0"
 			}
 		},
 		"esrecurse": {
@@ -1280,7 +1280,7 @@
 			"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
 			"dev": true,
 			"requires": {
-				"estraverse": "4.2.0"
+				"estraverse": "^4.1.0"
 			}
 		},
 		"estraverse": {
@@ -1301,8 +1301,8 @@
 			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
 			"dev": true,
 			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.50"
+				"d": "1",
+				"es5-ext": "~0.10.14"
 			}
 		},
 		"expand-brackets": {
@@ -1311,13 +1311,13 @@
 			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
 			"dev": true,
 			"requires": {
-				"debug": "2.6.9",
-				"define-property": "0.2.5",
-				"extend-shallow": "2.0.1",
-				"posix-character-classes": "0.1.1",
-				"regex-not": "1.0.2",
-				"snapdragon": "0.8.2",
-				"to-regex": "3.0.2"
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
 			},
 			"dependencies": {
 				"debug": {
@@ -1335,7 +1335,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "0.1.6"
+						"is-descriptor": "^0.1.0"
 					}
 				},
 				"extend-shallow": {
@@ -1344,7 +1344,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "0.1.1"
+						"is-extendable": "^0.1.0"
 					}
 				},
 				"ms": {
@@ -1361,7 +1361,7 @@
 			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
 			"dev": true,
 			"requires": {
-				"homedir-polyfill": "1.0.3"
+				"homedir-polyfill": "^1.0.1"
 			}
 		},
 		"extend": {
@@ -1376,8 +1376,8 @@
 			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
 			"dev": true,
 			"requires": {
-				"assign-symbols": "1.0.0",
-				"is-extendable": "1.0.1"
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
 			},
 			"dependencies": {
 				"is-extendable": {
@@ -1386,7 +1386,7 @@
 					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"dev": true,
 					"requires": {
-						"is-plain-object": "2.0.4"
+						"is-plain-object": "^2.0.4"
 					}
 				}
 			}
@@ -1397,9 +1397,9 @@
 			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
 			"dev": true,
 			"requires": {
-				"chardet": "0.7.0",
-				"iconv-lite": "0.4.24",
-				"tmp": "0.0.33"
+				"chardet": "^0.7.0",
+				"iconv-lite": "^0.4.24",
+				"tmp": "^0.0.33"
 			}
 		},
 		"extglob": {
@@ -1408,14 +1408,14 @@
 			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
 			"dev": true,
 			"requires": {
-				"array-unique": "0.3.2",
-				"define-property": "1.0.0",
-				"expand-brackets": "2.1.4",
-				"extend-shallow": "2.0.1",
-				"fragment-cache": "0.2.1",
-				"regex-not": "1.0.2",
-				"snapdragon": "0.8.2",
-				"to-regex": "3.0.2"
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
 			},
 			"dependencies": {
 				"define-property": {
@@ -1424,7 +1424,7 @@
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "1.0.2"
+						"is-descriptor": "^1.0.0"
 					}
 				},
 				"extend-shallow": {
@@ -1433,7 +1433,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "0.1.1"
+						"is-extendable": "^0.1.0"
 					}
 				},
 				"is-accessor-descriptor": {
@@ -1442,7 +1442,7 @@
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "6.0.2"
+						"kind-of": "^6.0.0"
 					}
 				},
 				"is-data-descriptor": {
@@ -1451,7 +1451,7 @@
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "6.0.2"
+						"kind-of": "^6.0.0"
 					}
 				},
 				"is-descriptor": {
@@ -1460,9 +1460,9 @@
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "1.0.0",
-						"is-data-descriptor": "1.0.0",
-						"kind-of": "6.0.2"
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
 				}
 			}
@@ -1473,10 +1473,10 @@
 			"integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
 			"dev": true,
 			"requires": {
-				"ansi-gray": "0.1.1",
-				"color-support": "1.1.3",
-				"parse-node-version": "1.0.1",
-				"time-stamp": "1.1.0"
+				"ansi-gray": "^0.1.1",
+				"color-support": "^1.1.3",
+				"parse-node-version": "^1.0.0",
+				"time-stamp": "^1.0.0"
 			}
 		},
 		"fast-deep-equal": {
@@ -1503,7 +1503,7 @@
 			"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
 			"dev": true,
 			"requires": {
-				"escape-string-regexp": "1.0.5"
+				"escape-string-regexp": "^1.0.5"
 			}
 		},
 		"file-entry-cache": {
@@ -1512,7 +1512,7 @@
 			"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
 			"dev": true,
 			"requires": {
-				"flat-cache": "2.0.1"
+				"flat-cache": "^2.0.1"
 			}
 		},
 		"filesize": {
@@ -1527,10 +1527,10 @@
 			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "2.0.1",
-				"is-number": "3.0.0",
-				"repeat-string": "1.6.1",
-				"to-regex-range": "2.1.1"
+				"extend-shallow": "^2.0.1",
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1",
+				"to-regex-range": "^2.1.0"
 			},
 			"dependencies": {
 				"extend-shallow": {
@@ -1539,7 +1539,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "0.1.1"
+						"is-extendable": "^0.1.0"
 					}
 				}
 			}
@@ -1550,8 +1550,8 @@
 			"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
 			"dev": true,
 			"requires": {
-				"path-exists": "2.1.0",
-				"pinkie-promise": "2.0.1"
+				"path-exists": "^2.0.0",
+				"pinkie-promise": "^2.0.0"
 			}
 		},
 		"findup-sync": {
@@ -1560,10 +1560,10 @@
 			"integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
 			"dev": true,
 			"requires": {
-				"detect-file": "1.0.0",
-				"is-glob": "4.0.1",
-				"micromatch": "3.1.10",
-				"resolve-dir": "1.0.1"
+				"detect-file": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"micromatch": "^3.0.4",
+				"resolve-dir": "^1.0.1"
 			}
 		},
 		"fined": {
@@ -1572,11 +1572,11 @@
 			"integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
 			"dev": true,
 			"requires": {
-				"expand-tilde": "2.0.2",
-				"is-plain-object": "2.0.4",
-				"object.defaults": "1.1.0",
-				"object.pick": "1.3.0",
-				"parse-filepath": "1.0.2"
+				"expand-tilde": "^2.0.2",
+				"is-plain-object": "^2.0.3",
+				"object.defaults": "^1.1.0",
+				"object.pick": "^1.2.0",
+				"parse-filepath": "^1.0.1"
 			}
 		},
 		"flagged-respawn": {
@@ -1591,7 +1591,7 @@
 			"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
 			"dev": true,
 			"requires": {
-				"flatted": "2.0.0",
+				"flatted": "^2.0.0",
 				"rimraf": "2.6.3",
 				"write": "1.0.3"
 			}
@@ -1608,8 +1608,8 @@
 			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"requires": {
-				"inherits": "2.0.3",
-				"readable-stream": "2.3.6"
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"for-in": {
@@ -1624,7 +1624,7 @@
 			"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
 			"dev": true,
 			"requires": {
-				"for-in": "1.0.2"
+				"for-in": "^1.0.1"
 			}
 		},
 		"fragment-cache": {
@@ -1633,7 +1633,7 @@
 			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
 			"dev": true,
 			"requires": {
-				"map-cache": "0.2.2"
+				"map-cache": "^0.2.2"
 			}
 		},
 		"fs-mkdirp-stream": {
@@ -1642,8 +1642,8 @@
 			"integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "4.1.15",
-				"through2": "2.0.5"
+				"graceful-fs": "^4.1.11",
+				"through2": "^2.0.3"
 			}
 		},
 		"fs.realpath": {
@@ -1659,8 +1659,8 @@
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"nan": "2.13.2",
-				"node-pre-gyp": "0.12.0"
+				"nan": "^2.12.1",
+				"node-pre-gyp": "^0.12.0"
 			},
 			"dependencies": {
 				"abbrev": {
@@ -1672,7 +1672,8 @@
 				"ansi-regex": {
 					"version": "2.1.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
@@ -1693,12 +1694,14 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"balanced-match": "1.0.0",
 						"concat-map": "0.0.1"
@@ -1713,17 +1716,20 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -1840,7 +1846,8 @@
 				"inherits": {
 					"version": "2.0.3",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -1852,6 +1859,7 @@
 					"version": "1.0.0",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"number-is-nan": "1.0.1"
 					}
@@ -1866,6 +1874,7 @@
 					"version": "3.0.4",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"brace-expansion": "1.1.11"
 					}
@@ -1873,12 +1882,14 @@
 				"minimist": {
 					"version": "0.0.8",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"minipass": {
 					"version": "2.3.5",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"safe-buffer": "5.1.2",
 						"yallist": "3.0.3"
@@ -1897,6 +1908,7 @@
 					"version": "0.5.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"minimist": "0.0.8"
 					}
@@ -1977,7 +1989,8 @@
 				"number-is-nan": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
@@ -1989,6 +2002,7 @@
 					"version": "1.4.0",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"wrappy": "1.0.2"
 					}
@@ -2074,7 +2088,8 @@
 				"safe-buffer": {
 					"version": "5.1.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
@@ -2110,6 +2125,7 @@
 					"version": "1.0.2",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"code-point-at": "1.1.0",
 						"is-fullwidth-code-point": "1.0.0",
@@ -2129,6 +2145,7 @@
 					"version": "3.0.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"ansi-regex": "2.1.1"
 					}
@@ -2172,12 +2189,14 @@
 				"wrappy": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"yallist": {
 					"version": "3.0.3",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				}
 			}
 		},
@@ -2217,12 +2236,12 @@
 			"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
 			"dev": true,
 			"requires": {
-				"fs.realpath": "1.0.0",
-				"inflight": "1.0.6",
-				"inherits": "2.0.3",
-				"minimatch": "3.0.4",
-				"once": "1.4.0",
-				"path-is-absolute": "1.0.1"
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
 			}
 		},
 		"glob-parent": {
@@ -2231,8 +2250,8 @@
 			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
 			"dev": true,
 			"requires": {
-				"is-glob": "3.1.0",
-				"path-dirname": "1.0.2"
+				"is-glob": "^3.1.0",
+				"path-dirname": "^1.0.0"
 			},
 			"dependencies": {
 				"is-glob": {
@@ -2241,7 +2260,7 @@
 					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"dev": true,
 					"requires": {
-						"is-extglob": "2.1.1"
+						"is-extglob": "^2.1.0"
 					}
 				}
 			}
@@ -2252,16 +2271,16 @@
 			"integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
 			"dev": true,
 			"requires": {
-				"extend": "3.0.2",
-				"glob": "7.1.4",
-				"glob-parent": "3.1.0",
-				"is-negated-glob": "1.0.0",
-				"ordered-read-streams": "1.0.1",
-				"pumpify": "1.5.1",
-				"readable-stream": "2.3.6",
-				"remove-trailing-separator": "1.1.0",
-				"to-absolute-glob": "2.0.2",
-				"unique-stream": "2.3.1"
+				"extend": "^3.0.0",
+				"glob": "^7.1.1",
+				"glob-parent": "^3.1.0",
+				"is-negated-glob": "^1.0.0",
+				"ordered-read-streams": "^1.0.0",
+				"pumpify": "^1.3.5",
+				"readable-stream": "^2.1.5",
+				"remove-trailing-separator": "^1.0.1",
+				"to-absolute-glob": "^2.0.0",
+				"unique-stream": "^2.0.2"
 			}
 		},
 		"glob-watcher": {
@@ -2270,12 +2289,12 @@
 			"integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
 			"dev": true,
 			"requires": {
-				"anymatch": "2.0.0",
-				"async-done": "1.3.1",
-				"chokidar": "2.1.5",
-				"is-negated-glob": "1.0.0",
-				"just-debounce": "1.0.0",
-				"object.defaults": "1.1.0"
+				"anymatch": "^2.0.0",
+				"async-done": "^1.2.0",
+				"chokidar": "^2.0.0",
+				"is-negated-glob": "^1.0.0",
+				"just-debounce": "^1.0.0",
+				"object.defaults": "^1.1.0"
 			}
 		},
 		"global-modules": {
@@ -2284,9 +2303,9 @@
 			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
 			"dev": true,
 			"requires": {
-				"global-prefix": "1.0.2",
-				"is-windows": "1.0.2",
-				"resolve-dir": "1.0.1"
+				"global-prefix": "^1.0.1",
+				"is-windows": "^1.0.1",
+				"resolve-dir": "^1.0.0"
 			}
 		},
 		"global-prefix": {
@@ -2295,11 +2314,11 @@
 			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
 			"dev": true,
 			"requires": {
-				"expand-tilde": "2.0.2",
-				"homedir-polyfill": "1.0.3",
-				"ini": "1.3.5",
-				"is-windows": "1.0.2",
-				"which": "1.3.1"
+				"expand-tilde": "^2.0.2",
+				"homedir-polyfill": "^1.0.1",
+				"ini": "^1.3.4",
+				"is-windows": "^1.0.1",
+				"which": "^1.2.14"
 			}
 		},
 		"globals": {
@@ -2314,7 +2333,7 @@
 			"integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
 			"dev": true,
 			"requires": {
-				"sparkles": "1.0.1"
+				"sparkles": "^1.0.0"
 			}
 		},
 		"graceful-fs": {
@@ -2335,10 +2354,10 @@
 			"integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
 			"dev": true,
 			"requires": {
-				"glob-watcher": "5.0.3",
-				"gulp-cli": "2.2.0",
-				"undertaker": "1.2.1",
-				"vinyl-fs": "3.0.3"
+				"glob-watcher": "^5.0.3",
+				"gulp-cli": "^2.2.0",
+				"undertaker": "^1.2.1",
+				"vinyl-fs": "^3.0.0"
 			},
 			"dependencies": {
 				"gulp-cli": {
@@ -2347,24 +2366,24 @@
 					"integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
 					"dev": true,
 					"requires": {
-						"ansi-colors": "1.1.0",
-						"archy": "1.0.0",
-						"array-sort": "1.0.0",
-						"color-support": "1.1.3",
-						"concat-stream": "1.6.2",
-						"copy-props": "2.0.4",
-						"fancy-log": "1.3.3",
-						"gulplog": "1.0.0",
-						"interpret": "1.2.0",
-						"isobject": "3.0.1",
-						"liftoff": "3.1.0",
-						"matchdep": "2.0.0",
-						"mute-stdout": "1.0.1",
-						"pretty-hrtime": "1.0.3",
-						"replace-homedir": "1.0.0",
-						"semver-greatest-satisfied-range": "1.1.0",
-						"v8flags": "3.1.3",
-						"yargs": "7.1.0"
+						"ansi-colors": "^1.0.1",
+						"archy": "^1.0.0",
+						"array-sort": "^1.0.0",
+						"color-support": "^1.1.3",
+						"concat-stream": "^1.6.0",
+						"copy-props": "^2.0.1",
+						"fancy-log": "^1.3.2",
+						"gulplog": "^1.0.0",
+						"interpret": "^1.1.0",
+						"isobject": "^3.0.1",
+						"liftoff": "^3.1.0",
+						"matchdep": "^2.0.0",
+						"mute-stdout": "^1.0.0",
+						"pretty-hrtime": "^1.0.0",
+						"replace-homedir": "^1.0.0",
+						"semver-greatest-satisfied-range": "^1.1.0",
+						"v8flags": "^3.0.1",
+						"yargs": "^7.1.0"
 					}
 				}
 			}
@@ -2375,9 +2394,9 @@
 			"integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
 			"dev": true,
 			"requires": {
-				"concat-with-sourcemaps": "1.1.0",
-				"through2": "2.0.5",
-				"vinyl": "2.2.0"
+				"concat-with-sourcemaps": "^1.0.0",
+				"through2": "^2.0.0",
+				"vinyl": "^2.0.0"
 			}
 		},
 		"gulp-cssmin": {
@@ -2386,13 +2405,13 @@
 			"integrity": "sha1-h6s8ad05sg1dljVcZQStakR7HnI=",
 			"dev": true,
 			"requires": {
-				"clean-css": "3.4.28",
-				"filesize": "2.0.4",
-				"graceful-fs": "4.1.15",
-				"gulp-rename": "1.1.0",
-				"gulp-util": "2.2.20",
+				"clean-css": "^3.1.9",
+				"filesize": "~2.0.0",
+				"graceful-fs": "~4.1.4",
+				"gulp-rename": "~1.1.0",
+				"gulp-util": "~2.2.0",
 				"map-stream": "0.0.4",
-				"temp-write": "0.1.1"
+				"temp-write": "~0.1.0"
 			},
 			"dependencies": {
 				"gulp-rename": {
@@ -2401,7 +2420,7 @@
 					"integrity": "sha1-kwkKqvTThsB/IFOKaIjxXvunJ6E=",
 					"dev": true,
 					"requires": {
-						"map-stream": "0.0.4"
+						"map-stream": ">=0.0.4"
 					}
 				}
 			}
@@ -2412,9 +2431,9 @@
 			"integrity": "sha512-nkqH5aRajfCGD8HB2yN+QSEQG0SMEpS7UyOp3HS966Og4DqUX0y8sPF5SU8uSsGLLLXbnHwyHbDkxauYO/pSpQ==",
 			"dev": true,
 			"requires": {
-				"jsonminify": "0.2.3",
-				"plugin-error": "0.1.2",
-				"through2": "0.6.5"
+				"jsonminify": "~0.2.3",
+				"plugin-error": "^0.1.2",
+				"through2": "~0.6.5"
 			},
 			"dependencies": {
 				"isarray": {
@@ -2429,10 +2448,10 @@
 					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
 					"dev": true,
 					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
 						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
+						"string_decoder": "~0.10.x"
 					}
 				},
 				"string_decoder": {
@@ -2447,8 +2466,8 @@
 					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
 					"dev": true,
 					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
+						"readable-stream": ">=1.0.33-1 <1.1.0-0",
+						"xtend": ">=4.0.0 <4.1.0-0"
 					}
 				}
 			}
@@ -2465,17 +2484,17 @@
 			"integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==",
 			"dev": true,
 			"requires": {
-				"@gulp-sourcemaps/identity-map": "1.0.2",
-				"@gulp-sourcemaps/map-sources": "1.0.0",
-				"acorn": "5.7.3",
-				"convert-source-map": "1.6.0",
-				"css": "2.2.4",
-				"debug-fabulous": "1.1.0",
-				"detect-newline": "2.1.0",
-				"graceful-fs": "4.1.15",
-				"source-map": "0.6.1",
-				"strip-bom-string": "1.0.0",
-				"through2": "2.0.5"
+				"@gulp-sourcemaps/identity-map": "1.X",
+				"@gulp-sourcemaps/map-sources": "1.X",
+				"acorn": "5.X",
+				"convert-source-map": "1.X",
+				"css": "2.X",
+				"debug-fabulous": "1.X",
+				"detect-newline": "2.X",
+				"graceful-fs": "4.X",
+				"source-map": "~0.6.0",
+				"strip-bom-string": "1.X",
+				"through2": "2.X"
 			},
 			"dependencies": {
 				"acorn": {
@@ -2498,16 +2517,16 @@
 			"integrity": "sha512-gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg==",
 			"dev": true,
 			"requires": {
-				"array-each": "1.0.1",
-				"extend-shallow": "3.0.2",
-				"gulplog": "1.0.0",
-				"has-gulplog": "0.1.0",
-				"isobject": "3.0.1",
-				"make-error-cause": "1.2.2",
-				"safe-buffer": "5.1.2",
-				"through2": "2.0.5",
-				"uglify-js": "3.5.12",
-				"vinyl-sourcemaps-apply": "0.2.1"
+				"array-each": "^1.0.1",
+				"extend-shallow": "^3.0.2",
+				"gulplog": "^1.0.0",
+				"has-gulplog": "^0.1.0",
+				"isobject": "^3.0.1",
+				"make-error-cause": "^1.1.1",
+				"safe-buffer": "^5.1.2",
+				"through2": "^2.0.0",
+				"uglify-js": "^3.0.5",
+				"vinyl-sourcemaps-apply": "^0.2.0"
 			}
 		},
 		"gulp-uglify-es": {
@@ -2516,11 +2535,11 @@
 			"integrity": "sha512-UMRufZsBmQizCYpftutaiVoLswpbzFEfY90EJLU4YlTgculeHnanb794s88TMd5tpCZVC638sAX6JrLVYTP/Wg==",
 			"dev": true,
 			"requires": {
-				"o-stream": "0.2.2",
-				"plugin-error": "1.0.1",
-				"terser": "3.17.0",
-				"vinyl": "2.2.0",
-				"vinyl-sourcemaps-apply": "0.2.1"
+				"o-stream": "^0.2.2",
+				"plugin-error": "^1.0.1",
+				"terser": "^3.7.5",
+				"vinyl": "^2.1.0",
+				"vinyl-sourcemaps-apply": "^0.2.1"
 			},
 			"dependencies": {
 				"plugin-error": {
@@ -2529,10 +2548,10 @@
 					"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
 					"dev": true,
 					"requires": {
-						"ansi-colors": "1.1.0",
-						"arr-diff": "4.0.0",
-						"arr-union": "3.1.0",
-						"extend-shallow": "3.0.2"
+						"ansi-colors": "^1.0.1",
+						"arr-diff": "^4.0.0",
+						"arr-union": "^3.1.0",
+						"extend-shallow": "^3.0.2"
 					}
 				}
 			}
@@ -2543,14 +2562,14 @@
 			"integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
 			"dev": true,
 			"requires": {
-				"chalk": "0.5.1",
-				"dateformat": "1.0.12",
-				"lodash._reinterpolate": "2.4.1",
-				"lodash.template": "2.4.1",
-				"minimist": "0.2.0",
-				"multipipe": "0.1.2",
-				"through2": "0.5.1",
-				"vinyl": "0.2.3"
+				"chalk": "^0.5.0",
+				"dateformat": "^1.0.7-1.2.3",
+				"lodash._reinterpolate": "^2.4.1",
+				"lodash.template": "^2.4.1",
+				"minimist": "^0.2.0",
+				"multipipe": "^0.1.0",
+				"through2": "^0.5.0",
+				"vinyl": "^0.2.1"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -2571,11 +2590,11 @@
 					"integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "1.1.0",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "0.1.0",
-						"strip-ansi": "0.3.0",
-						"supports-color": "0.2.0"
+						"ansi-styles": "^1.1.0",
+						"escape-string-regexp": "^1.0.0",
+						"has-ansi": "^0.1.0",
+						"strip-ansi": "^0.3.0",
+						"supports-color": "^0.2.0"
 					}
 				},
 				"clone-stats": {
@@ -2602,10 +2621,10 @@
 					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
 					"dev": true,
 					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
 						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
+						"string_decoder": "~0.10.x"
 					}
 				},
 				"string_decoder": {
@@ -2620,7 +2639,7 @@
 					"integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "0.2.1"
+						"ansi-regex": "^0.2.1"
 					}
 				},
 				"supports-color": {
@@ -2635,8 +2654,8 @@
 					"integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
 					"dev": true,
 					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "3.0.0"
+						"readable-stream": "~1.0.17",
+						"xtend": "~3.0.0"
 					}
 				},
 				"vinyl": {
@@ -2645,7 +2664,7 @@
 					"integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
 					"dev": true,
 					"requires": {
-						"clone-stats": "0.0.1"
+						"clone-stats": "~0.0.1"
 					}
 				},
 				"xtend": {
@@ -2662,7 +2681,7 @@
 			"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
 			"dev": true,
 			"requires": {
-				"glogg": "1.0.2"
+				"glogg": "^1.0.0"
 			}
 		},
 		"has-ansi": {
@@ -2671,7 +2690,7 @@
 			"integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "0.2.1"
+				"ansi-regex": "^0.2.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -2694,7 +2713,7 @@
 			"integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
 			"dev": true,
 			"requires": {
-				"sparkles": "1.0.1"
+				"sparkles": "^1.0.0"
 			}
 		},
 		"has-symbols": {
@@ -2709,9 +2728,9 @@
 			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
 			"dev": true,
 			"requires": {
-				"get-value": "2.0.6",
-				"has-values": "1.0.0",
-				"isobject": "3.0.1"
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
 			}
 		},
 		"has-values": {
@@ -2720,8 +2739,8 @@
 			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
 			"dev": true,
 			"requires": {
-				"is-number": "3.0.0",
-				"kind-of": "4.0.0"
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -2730,7 +2749,7 @@
 					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "1.1.6"
+						"is-buffer": "^1.1.5"
 					}
 				}
 			}
@@ -2741,7 +2760,7 @@
 			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
 			"dev": true,
 			"requires": {
-				"parse-passwd": "1.0.0"
+				"parse-passwd": "^1.0.0"
 			}
 		},
 		"hosted-git-info": {
@@ -2756,7 +2775,7 @@
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 			"dev": true,
 			"requires": {
-				"safer-buffer": "2.1.2"
+				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
 		"ignore": {
@@ -2771,8 +2790,8 @@
 			"integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
 			"dev": true,
 			"requires": {
-				"parent-module": "1.0.1",
-				"resolve-from": "4.0.0"
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
 			}
 		},
 		"imurmurhash": {
@@ -2787,7 +2806,7 @@
 			"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
 			"dev": true,
 			"requires": {
-				"repeating": "2.0.1"
+				"repeating": "^2.0.0"
 			}
 		},
 		"inflight": {
@@ -2796,8 +2815,8 @@
 			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 			"dev": true,
 			"requires": {
-				"once": "1.4.0",
-				"wrappy": "1.0.2"
+				"once": "^1.3.0",
+				"wrappy": "1"
 			}
 		},
 		"inherits": {
@@ -2818,19 +2837,19 @@
 			"integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
 			"dev": true,
 			"requires": {
-				"ansi-escapes": "3.2.0",
-				"chalk": "2.4.2",
-				"cli-cursor": "2.1.0",
-				"cli-width": "2.2.0",
-				"external-editor": "3.0.3",
-				"figures": "2.0.0",
-				"lodash": "4.17.11",
+				"ansi-escapes": "^3.2.0",
+				"chalk": "^2.4.2",
+				"cli-cursor": "^2.1.0",
+				"cli-width": "^2.0.0",
+				"external-editor": "^3.0.3",
+				"figures": "^2.0.0",
+				"lodash": "^4.17.11",
 				"mute-stream": "0.0.7",
-				"run-async": "2.3.0",
-				"rxjs": "6.5.2",
-				"string-width": "2.1.1",
-				"strip-ansi": "5.2.0",
-				"through": "2.3.8"
+				"run-async": "^2.2.0",
+				"rxjs": "^6.4.0",
+				"string-width": "^2.1.0",
+				"strip-ansi": "^5.1.0",
+				"through": "^2.3.6"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -2845,7 +2864,7 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "4.1.0"
+						"ansi-regex": "^4.1.0"
 					}
 				}
 			}
@@ -2868,8 +2887,8 @@
 			"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
 			"dev": true,
 			"requires": {
-				"is-relative": "1.0.0",
-				"is-windows": "1.0.2"
+				"is-relative": "^1.0.0",
+				"is-windows": "^1.0.1"
 			}
 		},
 		"is-accessor-descriptor": {
@@ -2878,7 +2897,7 @@
 			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
 			"dev": true,
 			"requires": {
-				"kind-of": "3.2.2"
+				"kind-of": "^3.0.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -2887,7 +2906,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "1.1.6"
+						"is-buffer": "^1.1.5"
 					}
 				}
 			}
@@ -2904,7 +2923,7 @@
 			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
 			"dev": true,
 			"requires": {
-				"binary-extensions": "1.13.1"
+				"binary-extensions": "^1.0.0"
 			}
 		},
 		"is-buffer": {
@@ -2919,7 +2938,7 @@
 			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
 			"dev": true,
 			"requires": {
-				"kind-of": "3.2.2"
+				"kind-of": "^3.0.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -2928,7 +2947,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "1.1.6"
+						"is-buffer": "^1.1.5"
 					}
 				}
 			}
@@ -2939,9 +2958,9 @@
 			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
 			"dev": true,
 			"requires": {
-				"is-accessor-descriptor": "0.1.6",
-				"is-data-descriptor": "0.1.4",
-				"kind-of": "5.1.0"
+				"is-accessor-descriptor": "^0.1.6",
+				"is-data-descriptor": "^0.1.4",
+				"kind-of": "^5.0.0"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -2970,7 +2989,7 @@
 			"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
 			"dev": true,
 			"requires": {
-				"number-is-nan": "1.0.1"
+				"number-is-nan": "^1.0.0"
 			}
 		},
 		"is-fullwidth-code-point": {
@@ -2985,7 +3004,7 @@
 			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
 			"dev": true,
 			"requires": {
-				"is-extglob": "2.1.1"
+				"is-extglob": "^2.1.1"
 			}
 		},
 		"is-negated-glob": {
@@ -3000,7 +3019,7 @@
 			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 			"dev": true,
 			"requires": {
-				"kind-of": "3.2.2"
+				"kind-of": "^3.0.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -3009,7 +3028,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "1.1.6"
+						"is-buffer": "^1.1.5"
 					}
 				}
 			}
@@ -3020,7 +3039,7 @@
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"dev": true,
 			"requires": {
-				"isobject": "3.0.1"
+				"isobject": "^3.0.1"
 			}
 		},
 		"is-promise": {
@@ -3035,7 +3054,7 @@
 			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
 			"dev": true,
 			"requires": {
-				"is-unc-path": "1.0.0"
+				"is-unc-path": "^1.0.0"
 			}
 		},
 		"is-unc-path": {
@@ -3044,7 +3063,7 @@
 			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
 			"dev": true,
 			"requires": {
-				"unc-path-regex": "0.1.2"
+				"unc-path-regex": "^0.1.2"
 			}
 		},
 		"is-utf8": {
@@ -3095,8 +3114,8 @@
 			"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
 			"dev": true,
 			"requires": {
-				"argparse": "1.0.10",
-				"esprima": "4.0.1"
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
 			}
 		},
 		"json-schema-traverse": {
@@ -3135,8 +3154,8 @@
 			"integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
 			"dev": true,
 			"requires": {
-				"default-resolution": "2.0.0",
-				"es6-weak-map": "2.0.2"
+				"default-resolution": "^2.0.0",
+				"es6-weak-map": "^2.0.1"
 			}
 		},
 		"lazystream": {
@@ -3145,7 +3164,7 @@
 			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
 			"dev": true,
 			"requires": {
-				"readable-stream": "2.3.6"
+				"readable-stream": "^2.0.5"
 			}
 		},
 		"lcid": {
@@ -3154,7 +3173,7 @@
 			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 			"dev": true,
 			"requires": {
-				"invert-kv": "1.0.0"
+				"invert-kv": "^1.0.0"
 			}
 		},
 		"lead": {
@@ -3163,7 +3182,7 @@
 			"integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
 			"dev": true,
 			"requires": {
-				"flush-write-stream": "1.1.1"
+				"flush-write-stream": "^1.0.2"
 			}
 		},
 		"levn": {
@@ -3172,8 +3191,8 @@
 			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
 			"dev": true,
 			"requires": {
-				"prelude-ls": "1.1.2",
-				"type-check": "0.3.2"
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2"
 			}
 		},
 		"liftoff": {
@@ -3182,14 +3201,14 @@
 			"integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
 			"dev": true,
 			"requires": {
-				"extend": "3.0.2",
-				"findup-sync": "3.0.0",
-				"fined": "1.2.0",
-				"flagged-respawn": "1.0.1",
-				"is-plain-object": "2.0.4",
-				"object.map": "1.0.1",
-				"rechoir": "0.6.2",
-				"resolve": "1.10.1"
+				"extend": "^3.0.0",
+				"findup-sync": "^3.0.0",
+				"fined": "^1.0.1",
+				"flagged-respawn": "^1.0.0",
+				"is-plain-object": "^2.0.4",
+				"object.map": "^1.0.0",
+				"rechoir": "^0.6.2",
+				"resolve": "^1.1.7"
 			}
 		},
 		"load-json-file": {
@@ -3198,11 +3217,11 @@
 			"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "4.1.15",
-				"parse-json": "2.2.0",
-				"pify": "2.3.0",
-				"pinkie-promise": "2.0.1",
-				"strip-bom": "2.0.0"
+				"graceful-fs": "^4.1.2",
+				"parse-json": "^2.2.0",
+				"pify": "^2.0.0",
+				"pinkie-promise": "^2.0.0",
+				"strip-bom": "^2.0.0"
 			}
 		},
 		"lodash": {
@@ -3217,7 +3236,7 @@
 			"integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
 			"dev": true,
 			"requires": {
-				"lodash._htmlescapes": "2.4.1"
+				"lodash._htmlescapes": "~2.4.1"
 			}
 		},
 		"lodash._escapestringchar": {
@@ -3256,8 +3275,8 @@
 			"integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
 			"dev": true,
 			"requires": {
-				"lodash._htmlescapes": "2.4.1",
-				"lodash.keys": "2.4.1"
+				"lodash._htmlescapes": "~2.4.1",
+				"lodash.keys": "~2.4.1"
 			}
 		},
 		"lodash._shimkeys": {
@@ -3266,7 +3285,7 @@
 			"integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
 			"dev": true,
 			"requires": {
-				"lodash._objecttypes": "2.4.1"
+				"lodash._objecttypes": "~2.4.1"
 			}
 		},
 		"lodash.defaults": {
@@ -3275,8 +3294,8 @@
 			"integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
 			"dev": true,
 			"requires": {
-				"lodash._objecttypes": "2.4.1",
-				"lodash.keys": "2.4.1"
+				"lodash._objecttypes": "~2.4.1",
+				"lodash.keys": "~2.4.1"
 			}
 		},
 		"lodash.escape": {
@@ -3285,9 +3304,9 @@
 			"integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
 			"dev": true,
 			"requires": {
-				"lodash._escapehtmlchar": "2.4.1",
-				"lodash._reunescapedhtml": "2.4.1",
-				"lodash.keys": "2.4.1"
+				"lodash._escapehtmlchar": "~2.4.1",
+				"lodash._reunescapedhtml": "~2.4.1",
+				"lodash.keys": "~2.4.1"
 			}
 		},
 		"lodash.isobject": {
@@ -3296,7 +3315,7 @@
 			"integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
 			"dev": true,
 			"requires": {
-				"lodash._objecttypes": "2.4.1"
+				"lodash._objecttypes": "~2.4.1"
 			}
 		},
 		"lodash.keys": {
@@ -3305,9 +3324,9 @@
 			"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
 			"dev": true,
 			"requires": {
-				"lodash._isnative": "2.4.1",
-				"lodash._shimkeys": "2.4.1",
-				"lodash.isobject": "2.4.1"
+				"lodash._isnative": "~2.4.1",
+				"lodash._shimkeys": "~2.4.1",
+				"lodash.isobject": "~2.4.1"
 			}
 		},
 		"lodash.template": {
@@ -3316,13 +3335,13 @@
 			"integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
 			"dev": true,
 			"requires": {
-				"lodash._escapestringchar": "2.4.1",
-				"lodash._reinterpolate": "2.4.1",
-				"lodash.defaults": "2.4.1",
-				"lodash.escape": "2.4.1",
-				"lodash.keys": "2.4.1",
-				"lodash.templatesettings": "2.4.1",
-				"lodash.values": "2.4.1"
+				"lodash._escapestringchar": "~2.4.1",
+				"lodash._reinterpolate": "~2.4.1",
+				"lodash.defaults": "~2.4.1",
+				"lodash.escape": "~2.4.1",
+				"lodash.keys": "~2.4.1",
+				"lodash.templatesettings": "~2.4.1",
+				"lodash.values": "~2.4.1"
 			}
 		},
 		"lodash.templatesettings": {
@@ -3331,8 +3350,8 @@
 			"integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
 			"dev": true,
 			"requires": {
-				"lodash._reinterpolate": "2.4.1",
-				"lodash.escape": "2.4.1"
+				"lodash._reinterpolate": "~2.4.1",
+				"lodash.escape": "~2.4.1"
 			}
 		},
 		"lodash.values": {
@@ -3341,7 +3360,7 @@
 			"integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
 			"dev": true,
 			"requires": {
-				"lodash.keys": "2.4.1"
+				"lodash.keys": "~2.4.1"
 			}
 		},
 		"loud-rejection": {
@@ -3350,8 +3369,8 @@
 			"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
 			"dev": true,
 			"requires": {
-				"currently-unhandled": "0.4.1",
-				"signal-exit": "3.0.2"
+				"currently-unhandled": "^0.4.1",
+				"signal-exit": "^3.0.0"
 			}
 		},
 		"lru-queue": {
@@ -3360,7 +3379,7 @@
 			"integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
 			"dev": true,
 			"requires": {
-				"es5-ext": "0.10.50"
+				"es5-ext": "~0.10.2"
 			}
 		},
 		"make-error": {
@@ -3375,7 +3394,7 @@
 			"integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
 			"dev": true,
 			"requires": {
-				"make-error": "1.3.5"
+				"make-error": "^1.2.0"
 			}
 		},
 		"make-iterator": {
@@ -3384,7 +3403,7 @@
 			"integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
 			"dev": true,
 			"requires": {
-				"kind-of": "6.0.2"
+				"kind-of": "^6.0.2"
 			}
 		},
 		"map-cache": {
@@ -3411,7 +3430,7 @@
 			"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
 			"dev": true,
 			"requires": {
-				"object-visit": "1.0.1"
+				"object-visit": "^1.0.0"
 			}
 		},
 		"matchdep": {
@@ -3420,9 +3439,9 @@
 			"integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
 			"dev": true,
 			"requires": {
-				"findup-sync": "2.0.0",
-				"micromatch": "3.1.10",
-				"resolve": "1.10.1",
+				"findup-sync": "^2.0.0",
+				"micromatch": "^3.0.4",
+				"resolve": "^1.4.0",
 				"stack-trace": "0.0.10"
 			},
 			"dependencies": {
@@ -3432,10 +3451,10 @@
 					"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
 					"dev": true,
 					"requires": {
-						"detect-file": "1.0.0",
-						"is-glob": "3.1.0",
-						"micromatch": "3.1.10",
-						"resolve-dir": "1.0.1"
+						"detect-file": "^1.0.0",
+						"is-glob": "^3.1.0",
+						"micromatch": "^3.0.4",
+						"resolve-dir": "^1.0.1"
 					}
 				},
 				"is-glob": {
@@ -3444,7 +3463,7 @@
 					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"dev": true,
 					"requires": {
-						"is-extglob": "2.1.1"
+						"is-extglob": "^2.1.0"
 					}
 				}
 			}
@@ -3455,14 +3474,14 @@
 			"integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
 			"dev": true,
 			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.50",
-				"es6-weak-map": "2.0.2",
-				"event-emitter": "0.3.5",
-				"is-promise": "2.1.0",
-				"lru-queue": "0.1.0",
-				"next-tick": "1.0.0",
-				"timers-ext": "0.1.7"
+				"d": "1",
+				"es5-ext": "^0.10.45",
+				"es6-weak-map": "^2.0.2",
+				"event-emitter": "^0.3.5",
+				"is-promise": "^2.1",
+				"lru-queue": "0.1",
+				"next-tick": "1",
+				"timers-ext": "^0.1.5"
 			}
 		},
 		"meow": {
@@ -3471,16 +3490,16 @@
 			"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
 			"dev": true,
 			"requires": {
-				"camelcase-keys": "2.1.0",
-				"decamelize": "1.2.0",
-				"loud-rejection": "1.6.0",
-				"map-obj": "1.0.1",
-				"minimist": "1.2.0",
-				"normalize-package-data": "2.5.0",
-				"object-assign": "4.1.1",
-				"read-pkg-up": "1.0.1",
-				"redent": "1.0.0",
-				"trim-newlines": "1.0.0"
+				"camelcase-keys": "^2.0.0",
+				"decamelize": "^1.1.2",
+				"loud-rejection": "^1.0.0",
+				"map-obj": "^1.0.1",
+				"minimist": "^1.1.3",
+				"normalize-package-data": "^2.3.4",
+				"object-assign": "^4.0.1",
+				"read-pkg-up": "^1.0.1",
+				"redent": "^1.0.0",
+				"trim-newlines": "^1.0.0"
 			},
 			"dependencies": {
 				"minimist": {
@@ -3497,19 +3516,19 @@
 			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 			"dev": true,
 			"requires": {
-				"arr-diff": "4.0.0",
-				"array-unique": "0.3.2",
-				"braces": "2.3.2",
-				"define-property": "2.0.2",
-				"extend-shallow": "3.0.2",
-				"extglob": "2.0.4",
-				"fragment-cache": "0.2.1",
-				"kind-of": "6.0.2",
-				"nanomatch": "1.2.13",
-				"object.pick": "1.3.0",
-				"regex-not": "1.0.2",
-				"snapdragon": "0.8.2",
-				"to-regex": "3.0.2"
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
 			}
 		},
 		"mimic-fn": {
@@ -3524,7 +3543,7 @@
 			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 			"dev": true,
 			"requires": {
-				"brace-expansion": "1.1.11"
+				"brace-expansion": "^1.1.7"
 			}
 		},
 		"minimist": {
@@ -3539,8 +3558,8 @@
 			"integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
 			"dev": true,
 			"requires": {
-				"for-in": "1.0.2",
-				"is-extendable": "1.0.1"
+				"for-in": "^1.0.2",
+				"is-extendable": "^1.0.1"
 			},
 			"dependencies": {
 				"is-extendable": {
@@ -3549,7 +3568,7 @@
 					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"dev": true,
 					"requires": {
-						"is-plain-object": "2.0.4"
+						"is-plain-object": "^2.0.4"
 					}
 				}
 			}
@@ -3603,17 +3622,17 @@
 			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
 			"dev": true,
 			"requires": {
-				"arr-diff": "4.0.0",
-				"array-unique": "0.3.2",
-				"define-property": "2.0.2",
-				"extend-shallow": "3.0.2",
-				"fragment-cache": "0.2.1",
-				"is-windows": "1.0.2",
-				"kind-of": "6.0.2",
-				"object.pick": "1.3.0",
-				"regex-not": "1.0.2",
-				"snapdragon": "0.8.2",
-				"to-regex": "3.0.2"
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
 			}
 		},
 		"natural-compare": {
@@ -3640,10 +3659,10 @@
 			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
 			"dev": true,
 			"requires": {
-				"hosted-git-info": "2.7.1",
-				"resolve": "1.10.1",
-				"semver": "5.7.0",
-				"validate-npm-package-license": "3.0.4"
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
 			}
 		},
 		"normalize-path": {
@@ -3652,7 +3671,7 @@
 			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
 			"dev": true,
 			"requires": {
-				"remove-trailing-separator": "1.1.0"
+				"remove-trailing-separator": "^1.0.1"
 			}
 		},
 		"now-and-later": {
@@ -3661,7 +3680,7 @@
 			"integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
 			"dev": true,
 			"requires": {
-				"once": "1.4.0"
+				"once": "^1.3.2"
 			}
 		},
 		"npm": {
@@ -3670,128 +3689,128 @@
 			"integrity": "sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==",
 			"dev": true,
 			"requires": {
-				"JSONStream": "1.3.5",
-				"abbrev": "1.1.1",
-				"ansicolors": "0.3.2",
-				"ansistyles": "0.1.3",
-				"aproba": "2.0.0",
-				"archy": "1.0.0",
-				"bin-links": "1.1.2",
-				"bluebird": "3.5.3",
-				"byte-size": "5.0.1",
-				"cacache": "11.3.2",
-				"call-limit": "1.1.0",
-				"chownr": "1.1.1",
-				"ci-info": "2.0.0",
-				"cli-columns": "3.1.2",
-				"cli-table3": "0.5.1",
-				"cmd-shim": "2.0.2",
-				"columnify": "1.5.4",
-				"config-chain": "1.1.12",
-				"debuglog": "1.0.1",
-				"detect-indent": "5.0.0",
-				"detect-newline": "2.1.0",
-				"dezalgo": "1.0.3",
-				"editor": "1.0.0",
-				"figgy-pudding": "3.5.1",
-				"find-npm-prefix": "1.0.2",
-				"fs-vacuum": "1.2.10",
-				"fs-write-stream-atomic": "1.0.10",
-				"gentle-fs": "2.0.1",
-				"glob": "7.1.3",
-				"graceful-fs": "4.1.15",
-				"has-unicode": "2.0.1",
-				"hosted-git-info": "2.7.1",
-				"iferr": "1.0.2",
-				"imurmurhash": "0.1.4",
-				"inflight": "1.0.6",
-				"inherits": "2.0.3",
-				"ini": "1.3.5",
-				"init-package-json": "1.10.3",
-				"is-cidr": "3.0.0",
-				"json-parse-better-errors": "1.0.2",
-				"lazy-property": "1.0.0",
-				"libcipm": "3.0.3",
-				"libnpm": "2.0.1",
-				"libnpmaccess": "3.0.1",
-				"libnpmhook": "5.0.2",
-				"libnpmorg": "1.0.0",
-				"libnpmsearch": "2.0.0",
-				"libnpmteam": "1.0.1",
-				"libnpx": "10.2.0",
-				"lock-verify": "2.1.0",
-				"lockfile": "1.0.4",
-				"lodash._baseindexof": "3.1.0",
-				"lodash._baseuniq": "4.6.0",
-				"lodash._bindcallback": "3.0.1",
-				"lodash._cacheindexof": "3.0.2",
-				"lodash._createcache": "3.1.2",
-				"lodash._getnative": "3.9.1",
-				"lodash.clonedeep": "4.5.0",
-				"lodash.restparam": "3.6.1",
-				"lodash.union": "4.6.0",
-				"lodash.uniq": "4.5.0",
-				"lodash.without": "4.4.0",
-				"lru-cache": "4.1.5",
-				"meant": "1.0.1",
-				"mississippi": "3.0.0",
-				"mkdirp": "0.5.1",
-				"move-concurrently": "1.0.1",
-				"node-gyp": "3.8.0",
-				"nopt": "4.0.1",
-				"normalize-package-data": "2.5.0",
-				"npm-audit-report": "1.3.2",
-				"npm-cache-filename": "1.0.2",
-				"npm-install-checks": "3.0.0",
-				"npm-lifecycle": "2.1.0",
-				"npm-package-arg": "6.1.0",
-				"npm-packlist": "1.4.1",
-				"npm-pick-manifest": "2.2.3",
-				"npm-profile": "4.0.1",
-				"npm-registry-fetch": "3.9.0",
-				"npm-user-validate": "1.0.0",
-				"npmlog": "4.1.2",
-				"once": "1.4.0",
-				"opener": "1.5.1",
-				"osenv": "0.1.5",
-				"pacote": "9.5.0",
-				"path-is-inside": "1.0.2",
-				"promise-inflight": "1.0.1",
-				"qrcode-terminal": "0.12.0",
-				"query-string": "6.2.0",
-				"qw": "1.0.1",
-				"read": "1.0.7",
-				"read-cmd-shim": "1.0.1",
-				"read-installed": "4.0.3",
-				"read-package-json": "2.0.13",
-				"read-package-tree": "5.2.2",
-				"readable-stream": "3.1.1",
-				"readdir-scoped-modules": "1.0.2",
-				"request": "2.88.0",
-				"retry": "0.12.0",
-				"rimraf": "2.6.3",
-				"safe-buffer": "5.1.2",
-				"semver": "5.6.0",
-				"sha": "2.0.1",
-				"slide": "1.1.6",
-				"sorted-object": "2.0.1",
-				"sorted-union-stream": "2.1.3",
-				"ssri": "6.0.1",
-				"stringify-package": "1.0.0",
-				"tar": "4.4.8",
-				"text-table": "0.2.0",
-				"tiny-relative-date": "1.3.0",
+				"JSONStream": "^1.3.5",
+				"abbrev": "~1.1.1",
+				"ansicolors": "~0.3.2",
+				"ansistyles": "~0.1.3",
+				"aproba": "^2.0.0",
+				"archy": "~1.0.0",
+				"bin-links": "^1.1.2",
+				"bluebird": "^3.5.3",
+				"byte-size": "^5.0.1",
+				"cacache": "^11.3.2",
+				"call-limit": "~1.1.0",
+				"chownr": "^1.1.1",
+				"ci-info": "^2.0.0",
+				"cli-columns": "^3.1.2",
+				"cli-table3": "^0.5.1",
+				"cmd-shim": "~2.0.2",
+				"columnify": "~1.5.4",
+				"config-chain": "^1.1.12",
+				"debuglog": "*",
+				"detect-indent": "~5.0.0",
+				"detect-newline": "^2.1.0",
+				"dezalgo": "~1.0.3",
+				"editor": "~1.0.0",
+				"figgy-pudding": "^3.5.1",
+				"find-npm-prefix": "^1.0.2",
+				"fs-vacuum": "~1.2.10",
+				"fs-write-stream-atomic": "~1.0.10",
+				"gentle-fs": "^2.0.1",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.1.15",
+				"has-unicode": "~2.0.1",
+				"hosted-git-info": "^2.7.1",
+				"iferr": "^1.0.2",
+				"imurmurhash": "*",
+				"inflight": "~1.0.6",
+				"inherits": "~2.0.3",
+				"ini": "^1.3.5",
+				"init-package-json": "^1.10.3",
+				"is-cidr": "^3.0.0",
+				"json-parse-better-errors": "^1.0.2",
+				"lazy-property": "~1.0.0",
+				"libcipm": "^3.0.3",
+				"libnpm": "^2.0.1",
+				"libnpmaccess": "*",
+				"libnpmhook": "^5.0.2",
+				"libnpmorg": "*",
+				"libnpmsearch": "*",
+				"libnpmteam": "*",
+				"libnpx": "^10.2.0",
+				"lock-verify": "^2.1.0",
+				"lockfile": "^1.0.4",
+				"lodash._baseindexof": "*",
+				"lodash._baseuniq": "~4.6.0",
+				"lodash._bindcallback": "*",
+				"lodash._cacheindexof": "*",
+				"lodash._createcache": "*",
+				"lodash._getnative": "*",
+				"lodash.clonedeep": "~4.5.0",
+				"lodash.restparam": "*",
+				"lodash.union": "~4.6.0",
+				"lodash.uniq": "~4.5.0",
+				"lodash.without": "~4.4.0",
+				"lru-cache": "^4.1.5",
+				"meant": "~1.0.1",
+				"mississippi": "^3.0.0",
+				"mkdirp": "~0.5.1",
+				"move-concurrently": "^1.0.1",
+				"node-gyp": "^3.8.0",
+				"nopt": "~4.0.1",
+				"normalize-package-data": "^2.5.0",
+				"npm-audit-report": "^1.3.2",
+				"npm-cache-filename": "~1.0.2",
+				"npm-install-checks": "~3.0.0",
+				"npm-lifecycle": "^2.1.0",
+				"npm-package-arg": "^6.1.0",
+				"npm-packlist": "^1.4.1",
+				"npm-pick-manifest": "^2.2.3",
+				"npm-profile": "*",
+				"npm-registry-fetch": "^3.9.0",
+				"npm-user-validate": "~1.0.0",
+				"npmlog": "~4.1.2",
+				"once": "~1.4.0",
+				"opener": "^1.5.1",
+				"osenv": "^0.1.5",
+				"pacote": "^9.5.0",
+				"path-is-inside": "~1.0.2",
+				"promise-inflight": "~1.0.1",
+				"qrcode-terminal": "^0.12.0",
+				"query-string": "^6.2.0",
+				"qw": "~1.0.1",
+				"read": "~1.0.7",
+				"read-cmd-shim": "~1.0.1",
+				"read-installed": "~4.0.3",
+				"read-package-json": "^2.0.13",
+				"read-package-tree": "^5.2.2",
+				"readable-stream": "^3.1.1",
+				"readdir-scoped-modules": "*",
+				"request": "^2.88.0",
+				"retry": "^0.12.0",
+				"rimraf": "^2.6.3",
+				"safe-buffer": "^5.1.2",
+				"semver": "^5.6.0",
+				"sha": "~2.0.1",
+				"slide": "~1.1.6",
+				"sorted-object": "~2.0.1",
+				"sorted-union-stream": "~2.1.3",
+				"ssri": "^6.0.1",
+				"stringify-package": "^1.0.0",
+				"tar": "^4.4.8",
+				"text-table": "~0.2.0",
+				"tiny-relative-date": "^1.3.0",
 				"uid-number": "0.0.6",
-				"umask": "1.1.0",
-				"unique-filename": "1.1.1",
-				"unpipe": "1.0.0",
-				"update-notifier": "2.5.0",
-				"uuid": "3.3.2",
-				"validate-npm-package-license": "3.0.4",
-				"validate-npm-package-name": "3.0.0",
-				"which": "1.3.1",
-				"worker-farm": "1.6.0",
-				"write-file-atomic": "2.4.2"
+				"umask": "~1.1.0",
+				"unique-filename": "^1.1.1",
+				"unpipe": "~1.0.0",
+				"update-notifier": "^2.5.0",
+				"uuid": "^3.3.2",
+				"validate-npm-package-license": "^3.0.4",
+				"validate-npm-package-name": "~3.0.0",
+				"which": "^1.3.1",
+				"worker-farm": "^1.6.0",
+				"write-file-atomic": "^2.4.2"
 			},
 			"dependencies": {
 				"JSONStream": {
@@ -3799,8 +3818,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"jsonparse": "1.3.1",
-						"through": "2.3.8"
+						"jsonparse": "^1.2.0",
+						"through": ">=2.2.7 <3"
 					}
 				},
 				"abbrev": {
@@ -3813,7 +3832,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"es6-promisify": "5.0.0"
+						"es6-promisify": "^5.0.0"
 					}
 				},
 				"agentkeepalive": {
@@ -3821,7 +3840,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"humanize-ms": "1.2.1"
+						"humanize-ms": "^1.2.1"
 					}
 				},
 				"ajv": {
@@ -3829,10 +3848,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"co": "4.6.0",
-						"fast-deep-equal": "1.1.0",
-						"fast-json-stable-stringify": "2.0.0",
-						"json-schema-traverse": "0.3.1"
+						"co": "^4.6.0",
+						"fast-deep-equal": "^1.0.0",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.3.0"
 					}
 				},
 				"ansi-align": {
@@ -3840,7 +3859,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"string-width": "2.1.1"
+						"string-width": "^2.0.0"
 					}
 				},
 				"ansi-regex": {
@@ -3853,7 +3872,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"color-convert": "1.9.1"
+						"color-convert": "^1.9.0"
 					}
 				},
 				"ansicolors": {
@@ -3881,8 +3900,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"delegates": "1.0.0",
-						"readable-stream": "2.3.6"
+						"delegates": "^1.0.0",
+						"readable-stream": "^2.0.6"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -3890,13 +3909,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -3904,7 +3923,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -3919,7 +3938,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"safer-buffer": "2.1.2"
+						"safer-buffer": "~2.1.0"
 					}
 				},
 				"assert-plus": {
@@ -3953,7 +3972,7 @@
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"tweetnacl": "0.14.5"
+						"tweetnacl": "^0.14.3"
 					}
 				},
 				"bin-links": {
@@ -3961,11 +3980,11 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"bluebird": "3.5.3",
-						"cmd-shim": "2.0.2",
-						"gentle-fs": "2.0.1",
-						"graceful-fs": "4.1.15",
-						"write-file-atomic": "2.4.2"
+						"bluebird": "^3.5.0",
+						"cmd-shim": "^2.0.2",
+						"gentle-fs": "^2.0.0",
+						"graceful-fs": "^4.1.11",
+						"write-file-atomic": "^2.3.0"
 					}
 				},
 				"block-stream": {
@@ -3973,7 +3992,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"inherits": "2.0.3"
+						"inherits": "~2.0.0"
 					}
 				},
 				"bluebird": {
@@ -3986,13 +4005,13 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ansi-align": "2.0.0",
-						"camelcase": "4.1.0",
-						"chalk": "2.4.1",
-						"cli-boxes": "1.0.0",
-						"string-width": "2.1.1",
-						"term-size": "1.2.0",
-						"widest-line": "2.0.0"
+						"ansi-align": "^2.0.0",
+						"camelcase": "^4.0.0",
+						"chalk": "^2.0.1",
+						"cli-boxes": "^1.0.0",
+						"string-width": "^2.0.0",
+						"term-size": "^1.2.0",
+						"widest-line": "^2.0.0"
 					}
 				},
 				"brace-expansion": {
@@ -4000,7 +4019,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"balanced-match": "1.0.0",
+						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
 					}
 				},
@@ -4029,20 +4048,20 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"bluebird": "3.5.3",
-						"chownr": "1.1.1",
-						"figgy-pudding": "3.5.1",
-						"glob": "7.1.3",
-						"graceful-fs": "4.1.15",
-						"lru-cache": "5.1.1",
-						"mississippi": "3.0.0",
-						"mkdirp": "0.5.1",
-						"move-concurrently": "1.0.1",
-						"promise-inflight": "1.0.1",
-						"rimraf": "2.6.3",
-						"ssri": "6.0.1",
-						"unique-filename": "1.1.1",
-						"y18n": "4.0.0"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					},
 					"dependencies": {
 						"chownr": {
@@ -4055,7 +4074,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"yallist": "3.0.3"
+								"yallist": "^3.0.2"
 							}
 						},
 						"unique-filename": {
@@ -4063,7 +4082,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"unique-slug": "2.0.0"
+								"unique-slug": "^2.0.0"
 							}
 						},
 						"yallist": {
@@ -4098,9 +4117,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ansi-styles": "3.2.1",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "5.4.0"
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
 					}
 				},
 				"chownr": {
@@ -4118,7 +4137,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ip-regex": "2.1.0"
+						"ip-regex": "^2.1.0"
 					}
 				},
 				"cli-boxes": {
@@ -4131,8 +4150,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"string-width": "2.1.1",
-						"strip-ansi": "3.0.1"
+						"string-width": "^2.0.0",
+						"strip-ansi": "^3.0.1"
 					}
 				},
 				"cli-table3": {
@@ -4140,9 +4159,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"colors": "1.3.3",
-						"object-assign": "4.1.1",
-						"string-width": "2.1.1"
+						"colors": "^1.1.2",
+						"object-assign": "^4.1.0",
+						"string-width": "^2.1.1"
 					}
 				},
 				"cliui": {
@@ -4150,9 +4169,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"string-width": "2.1.1",
-						"strip-ansi": "4.0.0",
-						"wrap-ansi": "2.1.0"
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0",
+						"wrap-ansi": "^2.0.0"
 					},
 					"dependencies": {
 						"ansi-regex": {
@@ -4165,7 +4184,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"ansi-regex": "3.0.0"
+								"ansi-regex": "^3.0.0"
 							}
 						}
 					}
@@ -4180,8 +4199,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"graceful-fs": "4.1.15",
-						"mkdirp": "0.5.1"
+						"graceful-fs": "^4.1.2",
+						"mkdirp": "~0.5.0"
 					}
 				},
 				"co": {
@@ -4199,7 +4218,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"color-name": "1.1.3"
+						"color-name": "^1.1.1"
 					}
 				},
 				"color-name": {
@@ -4218,8 +4237,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"strip-ansi": "3.0.1",
-						"wcwidth": "1.0.1"
+						"strip-ansi": "^3.0.0",
+						"wcwidth": "^1.0.0"
 					}
 				},
 				"combined-stream": {
@@ -4227,7 +4246,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"delayed-stream": "1.0.0"
+						"delayed-stream": "~1.0.0"
 					}
 				},
 				"concat-map": {
@@ -4240,10 +4259,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"buffer-from": "1.0.0",
-						"inherits": "2.0.3",
-						"readable-stream": "2.3.6",
-						"typedarray": "0.0.6"
+						"buffer-from": "^1.0.0",
+						"inherits": "^2.0.3",
+						"readable-stream": "^2.2.2",
+						"typedarray": "^0.0.6"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -4251,13 +4270,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -4265,7 +4284,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -4275,8 +4294,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ini": "1.3.5",
-						"proto-list": "1.2.4"
+						"ini": "^1.3.4",
+						"proto-list": "~1.2.1"
 					}
 				},
 				"configstore": {
@@ -4284,12 +4303,12 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"dot-prop": "4.2.0",
-						"graceful-fs": "4.1.15",
-						"make-dir": "1.3.0",
-						"unique-string": "1.0.0",
-						"write-file-atomic": "2.4.2",
-						"xdg-basedir": "3.0.0"
+						"dot-prop": "^4.1.0",
+						"graceful-fs": "^4.1.2",
+						"make-dir": "^1.0.0",
+						"unique-string": "^1.0.0",
+						"write-file-atomic": "^2.0.0",
+						"xdg-basedir": "^3.0.0"
 					}
 				},
 				"console-control-strings": {
@@ -4302,12 +4321,12 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "1.2.0",
-						"fs-write-stream-atomic": "1.0.10",
-						"iferr": "0.1.5",
-						"mkdirp": "0.5.1",
-						"rimraf": "2.6.3",
-						"run-queue": "1.0.3"
+						"aproba": "^1.1.1",
+						"fs-write-stream-atomic": "^1.0.8",
+						"iferr": "^0.1.5",
+						"mkdirp": "^0.5.1",
+						"rimraf": "^2.5.4",
+						"run-queue": "^1.0.0"
 					},
 					"dependencies": {
 						"aproba": {
@@ -4332,7 +4351,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"capture-stack-trace": "1.0.0"
+						"capture-stack-trace": "^1.0.0"
 					}
 				},
 				"cross-spawn": {
@@ -4340,9 +4359,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"lru-cache": "4.1.5",
-						"shebang-command": "1.2.0",
-						"which": "1.3.1"
+						"lru-cache": "^4.0.1",
+						"shebang-command": "^1.2.0",
+						"which": "^1.2.9"
 					}
 				},
 				"crypto-random-string": {
@@ -4360,7 +4379,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"assert-plus": "1.0.0"
+						"assert-plus": "^1.0.0"
 					}
 				},
 				"debug": {
@@ -4403,7 +4422,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"clone": "1.0.4"
+						"clone": "^1.0.2"
 					}
 				},
 				"delayed-stream": {
@@ -4431,8 +4450,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"asap": "2.0.6",
-						"wrappy": "1.0.2"
+						"asap": "^2.0.0",
+						"wrappy": "1"
 					}
 				},
 				"dot-prop": {
@@ -4440,7 +4459,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"is-obj": "1.0.1"
+						"is-obj": "^1.0.0"
 					}
 				},
 				"dotenv": {
@@ -4458,10 +4477,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"end-of-stream": "1.4.1",
-						"inherits": "2.0.3",
-						"readable-stream": "2.3.6",
-						"stream-shift": "1.0.0"
+						"end-of-stream": "^1.0.0",
+						"inherits": "^2.0.1",
+						"readable-stream": "^2.0.0",
+						"stream-shift": "^1.0.0"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -4469,13 +4488,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -4483,7 +4502,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -4494,8 +4513,8 @@
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"jsbn": "0.1.1",
-						"safer-buffer": "2.1.2"
+						"jsbn": "~0.1.0",
+						"safer-buffer": "^2.1.0"
 					}
 				},
 				"editor": {
@@ -4508,7 +4527,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"iconv-lite": "0.4.23"
+						"iconv-lite": "~0.4.13"
 					}
 				},
 				"end-of-stream": {
@@ -4516,7 +4535,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"once": "1.4.0"
+						"once": "^1.4.0"
 					}
 				},
 				"err-code": {
@@ -4529,7 +4548,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"prr": "1.0.1"
+						"prr": "~1.0.1"
 					}
 				},
 				"es6-promise": {
@@ -4542,7 +4561,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"es6-promise": "4.2.6"
+						"es6-promise": "^4.0.3"
 					}
 				},
 				"escape-string-regexp": {
@@ -4555,13 +4574,13 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"cross-spawn": "5.1.0",
-						"get-stream": "3.0.0",
-						"is-stream": "1.1.0",
-						"npm-run-path": "2.0.2",
-						"p-finally": "1.0.0",
-						"signal-exit": "3.0.2",
-						"strip-eof": "1.0.0"
+						"cross-spawn": "^5.0.1",
+						"get-stream": "^3.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
 					},
 					"dependencies": {
 						"get-stream": {
@@ -4606,7 +4625,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"locate-path": "2.0.0"
+						"locate-path": "^2.0.0"
 					}
 				},
 				"flush-write-stream": {
@@ -4614,8 +4633,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"inherits": "2.0.3",
-						"readable-stream": "2.3.6"
+						"inherits": "^2.0.1",
+						"readable-stream": "^2.0.4"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -4623,13 +4642,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -4637,7 +4656,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -4652,9 +4671,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"asynckit": "0.4.0",
+						"asynckit": "^0.4.0",
 						"combined-stream": "1.0.6",
-						"mime-types": "2.1.19"
+						"mime-types": "^2.1.12"
 					}
 				},
 				"from2": {
@@ -4662,8 +4681,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"inherits": "2.0.3",
-						"readable-stream": "2.3.6"
+						"inherits": "^2.0.1",
+						"readable-stream": "^2.0.0"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -4671,13 +4690,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -4685,7 +4704,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -4695,7 +4714,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"minipass": "2.3.3"
+						"minipass": "^2.2.1"
 					}
 				},
 				"fs-vacuum": {
@@ -4703,9 +4722,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"graceful-fs": "4.1.15",
-						"path-is-inside": "1.0.2",
-						"rimraf": "2.6.3"
+						"graceful-fs": "^4.1.2",
+						"path-is-inside": "^1.0.1",
+						"rimraf": "^2.5.2"
 					}
 				},
 				"fs-write-stream-atomic": {
@@ -4713,10 +4732,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"graceful-fs": "4.1.15",
-						"iferr": "0.1.5",
-						"imurmurhash": "0.1.4",
-						"readable-stream": "2.3.6"
+						"graceful-fs": "^4.1.2",
+						"iferr": "^0.1.5",
+						"imurmurhash": "^0.1.4",
+						"readable-stream": "1 || 2"
 					},
 					"dependencies": {
 						"iferr": {
@@ -4729,13 +4748,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -4743,7 +4762,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -4758,10 +4777,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"graceful-fs": "4.1.15",
-						"inherits": "2.0.3",
-						"mkdirp": "0.5.1",
-						"rimraf": "2.6.3"
+						"graceful-fs": "^4.1.2",
+						"inherits": "~2.0.0",
+						"mkdirp": ">=0.5 0",
+						"rimraf": "2"
 					}
 				},
 				"gauge": {
@@ -4769,14 +4788,14 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "1.2.0",
-						"console-control-strings": "1.1.0",
-						"has-unicode": "2.0.1",
-						"object-assign": "4.1.1",
-						"signal-exit": "3.0.2",
-						"string-width": "1.0.2",
-						"strip-ansi": "3.0.1",
-						"wide-align": "1.1.2"
+						"aproba": "^1.0.3",
+						"console-control-strings": "^1.0.0",
+						"has-unicode": "^2.0.0",
+						"object-assign": "^4.1.0",
+						"signal-exit": "^3.0.0",
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wide-align": "^1.1.0"
 					},
 					"dependencies": {
 						"aproba": {
@@ -4789,9 +4808,9 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"code-point-at": "1.1.0",
-								"is-fullwidth-code-point": "1.0.0",
-								"strip-ansi": "3.0.1"
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
 							}
 						}
 					}
@@ -4806,14 +4825,14 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "1.2.0",
-						"fs-vacuum": "1.2.10",
-						"graceful-fs": "4.1.15",
-						"iferr": "0.1.5",
-						"mkdirp": "0.5.1",
-						"path-is-inside": "1.0.2",
-						"read-cmd-shim": "1.0.1",
-						"slide": "1.1.6"
+						"aproba": "^1.1.2",
+						"fs-vacuum": "^1.2.10",
+						"graceful-fs": "^4.1.11",
+						"iferr": "^0.1.5",
+						"mkdirp": "^0.5.1",
+						"path-is-inside": "^1.0.2",
+						"read-cmd-shim": "^1.0.1",
+						"slide": "^1.1.6"
 					},
 					"dependencies": {
 						"aproba": {
@@ -4838,7 +4857,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"pump": "3.0.0"
+						"pump": "^3.0.0"
 					}
 				},
 				"getpass": {
@@ -4846,7 +4865,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"assert-plus": "1.0.0"
+						"assert-plus": "^1.0.0"
 					}
 				},
 				"glob": {
@@ -4854,12 +4873,12 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"fs.realpath": "1.0.0",
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.4",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
 					}
 				},
 				"global-dirs": {
@@ -4867,7 +4886,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ini": "1.3.5"
+						"ini": "^1.3.4"
 					}
 				},
 				"got": {
@@ -4875,17 +4894,17 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"create-error-class": "3.0.2",
-						"duplexer3": "0.1.4",
-						"get-stream": "3.0.0",
-						"is-redirect": "1.0.0",
-						"is-retry-allowed": "1.1.0",
-						"is-stream": "1.1.0",
-						"lowercase-keys": "1.0.1",
-						"safe-buffer": "5.1.2",
-						"timed-out": "4.0.1",
-						"unzip-response": "2.0.1",
-						"url-parse-lax": "1.0.0"
+						"create-error-class": "^3.0.0",
+						"duplexer3": "^0.1.4",
+						"get-stream": "^3.0.0",
+						"is-redirect": "^1.0.0",
+						"is-retry-allowed": "^1.0.0",
+						"is-stream": "^1.0.0",
+						"lowercase-keys": "^1.0.0",
+						"safe-buffer": "^5.0.1",
+						"timed-out": "^4.0.0",
+						"unzip-response": "^2.0.1",
+						"url-parse-lax": "^1.0.0"
 					},
 					"dependencies": {
 						"get-stream": {
@@ -4910,8 +4929,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ajv": "5.5.2",
-						"har-schema": "2.0.0"
+						"ajv": "^5.3.0",
+						"har-schema": "^2.0.0"
 					}
 				},
 				"has-flag": {
@@ -4939,7 +4958,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"agent-base": "4.2.1",
+						"agent-base": "4",
 						"debug": "3.1.0"
 					}
 				},
@@ -4948,9 +4967,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"assert-plus": "1.0.0",
-						"jsprim": "1.4.1",
-						"sshpk": "1.14.2"
+						"assert-plus": "^1.0.0",
+						"jsprim": "^1.2.2",
+						"sshpk": "^1.7.0"
 					}
 				},
 				"https-proxy-agent": {
@@ -4958,8 +4977,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"agent-base": "4.2.1",
-						"debug": "3.1.0"
+						"agent-base": "^4.1.0",
+						"debug": "^3.1.0"
 					}
 				},
 				"humanize-ms": {
@@ -4967,7 +4986,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ms": "2.1.1"
+						"ms": "^2.0.0"
 					}
 				},
 				"iconv-lite": {
@@ -4975,7 +4994,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"safer-buffer": "2.1.2"
+						"safer-buffer": ">= 2.1.2 < 3"
 					}
 				},
 				"iferr": {
@@ -4988,7 +5007,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"minimatch": "3.0.4"
+						"minimatch": "^3.0.4"
 					}
 				},
 				"import-lazy": {
@@ -5006,8 +5025,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"once": "1.4.0",
-						"wrappy": "1.0.2"
+						"once": "^1.3.0",
+						"wrappy": "1"
 					}
 				},
 				"inherits": {
@@ -5025,14 +5044,14 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"glob": "7.1.3",
-						"npm-package-arg": "6.1.0",
-						"promzard": "0.3.0",
-						"read": "1.0.7",
-						"read-package-json": "2.0.13",
-						"semver": "5.6.0",
-						"validate-npm-package-license": "3.0.4",
-						"validate-npm-package-name": "3.0.0"
+						"glob": "^7.1.1",
+						"npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+						"promzard": "^0.3.0",
+						"read": "~1.0.1",
+						"read-package-json": "1 || 2",
+						"semver": "2.x || 3.x || 4 || 5",
+						"validate-npm-package-license": "^3.0.1",
+						"validate-npm-package-name": "^3.0.0"
 					}
 				},
 				"invert-kv": {
@@ -5055,7 +5074,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ci-info": "1.6.0"
+						"ci-info": "^1.0.0"
 					},
 					"dependencies": {
 						"ci-info": {
@@ -5070,7 +5089,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"cidr-regex": "2.0.10"
+						"cidr-regex": "^2.0.10"
 					}
 				},
 				"is-fullwidth-code-point": {
@@ -5078,7 +5097,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"number-is-nan": "1.0.1"
+						"number-is-nan": "^1.0.0"
 					}
 				},
 				"is-installed-globally": {
@@ -5086,8 +5105,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"global-dirs": "0.1.1",
-						"is-path-inside": "1.0.1"
+						"global-dirs": "^0.1.0",
+						"is-path-inside": "^1.0.0"
 					}
 				},
 				"is-npm": {
@@ -5105,7 +5124,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"path-is-inside": "1.0.2"
+						"path-is-inside": "^1.0.1"
 					}
 				},
 				"is-redirect": {
@@ -5190,7 +5209,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"package-json": "4.0.1"
+						"package-json": "^4.0.0"
 					}
 				},
 				"lazy-property": {
@@ -5203,7 +5222,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"invert-kv": "1.0.0"
+						"invert-kv": "^1.0.0"
 					}
 				},
 				"libcipm": {
@@ -5211,21 +5230,21 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"bin-links": "1.1.2",
-						"bluebird": "3.5.3",
-						"figgy-pudding": "3.5.1",
-						"find-npm-prefix": "1.0.2",
-						"graceful-fs": "4.1.15",
-						"ini": "1.3.5",
-						"lock-verify": "2.1.0",
-						"mkdirp": "0.5.1",
-						"npm-lifecycle": "2.1.0",
-						"npm-logical-tree": "1.2.1",
-						"npm-package-arg": "6.1.0",
-						"pacote": "9.5.0",
-						"read-package-json": "2.0.13",
-						"rimraf": "2.6.3",
-						"worker-farm": "1.6.0"
+						"bin-links": "^1.1.2",
+						"bluebird": "^3.5.1",
+						"figgy-pudding": "^3.5.1",
+						"find-npm-prefix": "^1.0.2",
+						"graceful-fs": "^4.1.11",
+						"ini": "^1.3.5",
+						"lock-verify": "^2.0.2",
+						"mkdirp": "^0.5.1",
+						"npm-lifecycle": "^2.0.3",
+						"npm-logical-tree": "^1.2.1",
+						"npm-package-arg": "^6.1.0",
+						"pacote": "^9.1.0",
+						"read-package-json": "^2.0.13",
+						"rimraf": "^2.6.2",
+						"worker-farm": "^1.6.0"
 					}
 				},
 				"libnpm": {
@@ -5233,26 +5252,26 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"bin-links": "1.1.2",
-						"bluebird": "3.5.3",
-						"find-npm-prefix": "1.0.2",
-						"libnpmaccess": "3.0.1",
-						"libnpmconfig": "1.2.1",
-						"libnpmhook": "5.0.2",
-						"libnpmorg": "1.0.0",
-						"libnpmpublish": "1.1.1",
-						"libnpmsearch": "2.0.0",
-						"libnpmteam": "1.0.1",
-						"lock-verify": "2.1.0",
-						"npm-lifecycle": "2.1.0",
-						"npm-logical-tree": "1.2.1",
-						"npm-package-arg": "6.1.0",
-						"npm-profile": "4.0.1",
-						"npm-registry-fetch": "3.9.0",
-						"npmlog": "4.1.2",
-						"pacote": "9.5.0",
-						"read-package-json": "2.0.13",
-						"stringify-package": "1.0.0"
+						"bin-links": "^1.1.2",
+						"bluebird": "^3.5.3",
+						"find-npm-prefix": "^1.0.2",
+						"libnpmaccess": "^3.0.1",
+						"libnpmconfig": "^1.2.1",
+						"libnpmhook": "^5.0.2",
+						"libnpmorg": "^1.0.0",
+						"libnpmpublish": "^1.1.0",
+						"libnpmsearch": "^2.0.0",
+						"libnpmteam": "^1.0.1",
+						"lock-verify": "^2.0.2",
+						"npm-lifecycle": "^2.1.0",
+						"npm-logical-tree": "^1.2.1",
+						"npm-package-arg": "^6.1.0",
+						"npm-profile": "^4.0.1",
+						"npm-registry-fetch": "^3.8.0",
+						"npmlog": "^4.1.2",
+						"pacote": "^9.2.3",
+						"read-package-json": "^2.0.13",
+						"stringify-package": "^1.0.0"
 					}
 				},
 				"libnpmaccess": {
@@ -5260,10 +5279,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "2.0.0",
-						"get-stream": "4.1.0",
-						"npm-package-arg": "6.1.0",
-						"npm-registry-fetch": "3.9.0"
+						"aproba": "^2.0.0",
+						"get-stream": "^4.0.0",
+						"npm-package-arg": "^6.1.0",
+						"npm-registry-fetch": "^3.8.0"
 					},
 					"dependencies": {
 						"aproba": {
@@ -5278,9 +5297,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"figgy-pudding": "3.5.1",
-						"find-up": "3.0.0",
-						"ini": "1.3.5"
+						"figgy-pudding": "^3.5.1",
+						"find-up": "^3.0.0",
+						"ini": "^1.3.5"
 					},
 					"dependencies": {
 						"find-up": {
@@ -5288,7 +5307,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"locate-path": "3.0.0"
+								"locate-path": "^3.0.0"
 							}
 						},
 						"locate-path": {
@@ -5296,8 +5315,8 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"p-locate": "3.0.0",
-								"path-exists": "3.0.0"
+								"p-locate": "^3.0.0",
+								"path-exists": "^3.0.0"
 							}
 						},
 						"p-limit": {
@@ -5305,7 +5324,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"p-try": "2.0.0"
+								"p-try": "^2.0.0"
 							}
 						},
 						"p-locate": {
@@ -5313,7 +5332,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"p-limit": "2.1.0"
+								"p-limit": "^2.0.0"
 							}
 						},
 						"p-try": {
@@ -5328,10 +5347,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "2.0.0",
-						"figgy-pudding": "3.5.1",
-						"get-stream": "4.1.0",
-						"npm-registry-fetch": "3.9.0"
+						"aproba": "^2.0.0",
+						"figgy-pudding": "^3.4.1",
+						"get-stream": "^4.0.0",
+						"npm-registry-fetch": "^3.8.0"
 					}
 				},
 				"libnpmorg": {
@@ -5339,10 +5358,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "2.0.0",
-						"figgy-pudding": "3.5.1",
-						"get-stream": "4.1.0",
-						"npm-registry-fetch": "3.9.0"
+						"aproba": "^2.0.0",
+						"figgy-pudding": "^3.4.1",
+						"get-stream": "^4.0.0",
+						"npm-registry-fetch": "^3.8.0"
 					},
 					"dependencies": {
 						"aproba": {
@@ -5357,15 +5376,15 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "2.0.0",
-						"figgy-pudding": "3.5.1",
-						"get-stream": "4.1.0",
-						"lodash.clonedeep": "4.5.0",
-						"normalize-package-data": "2.5.0",
-						"npm-package-arg": "6.1.0",
-						"npm-registry-fetch": "3.9.0",
-						"semver": "5.6.0",
-						"ssri": "6.0.1"
+						"aproba": "^2.0.0",
+						"figgy-pudding": "^3.5.1",
+						"get-stream": "^4.0.0",
+						"lodash.clonedeep": "^4.5.0",
+						"normalize-package-data": "^2.4.0",
+						"npm-package-arg": "^6.1.0",
+						"npm-registry-fetch": "^3.8.0",
+						"semver": "^5.5.1",
+						"ssri": "^6.0.1"
 					}
 				},
 				"libnpmsearch": {
@@ -5373,9 +5392,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"figgy-pudding": "3.5.1",
-						"get-stream": "4.1.0",
-						"npm-registry-fetch": "3.9.0"
+						"figgy-pudding": "^3.5.1",
+						"get-stream": "^4.0.0",
+						"npm-registry-fetch": "^3.8.0"
 					}
 				},
 				"libnpmteam": {
@@ -5383,10 +5402,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "2.0.0",
-						"figgy-pudding": "3.5.1",
-						"get-stream": "4.1.0",
-						"npm-registry-fetch": "3.9.0"
+						"aproba": "^2.0.0",
+						"figgy-pudding": "^3.4.1",
+						"get-stream": "^4.0.0",
+						"npm-registry-fetch": "^3.8.0"
 					},
 					"dependencies": {
 						"aproba": {
@@ -5401,14 +5420,14 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"dotenv": "5.0.1",
-						"npm-package-arg": "6.1.0",
-						"rimraf": "2.6.3",
-						"safe-buffer": "5.1.2",
-						"update-notifier": "2.5.0",
-						"which": "1.3.1",
-						"y18n": "4.0.0",
-						"yargs": "11.0.0"
+						"dotenv": "^5.0.1",
+						"npm-package-arg": "^6.0.0",
+						"rimraf": "^2.6.2",
+						"safe-buffer": "^5.1.0",
+						"update-notifier": "^2.3.0",
+						"which": "^1.3.0",
+						"y18n": "^4.0.0",
+						"yargs": "^11.0.0"
 					}
 				},
 				"locate-path": {
@@ -5416,8 +5435,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"p-locate": "2.0.0",
-						"path-exists": "3.0.0"
+						"p-locate": "^2.0.0",
+						"path-exists": "^3.0.0"
 					}
 				},
 				"lock-verify": {
@@ -5425,8 +5444,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"npm-package-arg": "6.1.0",
-						"semver": "5.6.0"
+						"npm-package-arg": "^6.1.0",
+						"semver": "^5.4.1"
 					}
 				},
 				"lockfile": {
@@ -5434,7 +5453,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"signal-exit": "3.0.2"
+						"signal-exit": "^3.0.2"
 					}
 				},
 				"lodash._baseindexof": {
@@ -5447,8 +5466,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"lodash._createset": "4.0.3",
-						"lodash._root": "3.0.1"
+						"lodash._createset": "~4.0.0",
+						"lodash._root": "~3.0.0"
 					}
 				},
 				"lodash._bindcallback": {
@@ -5466,7 +5485,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"lodash._getnative": "3.9.1"
+						"lodash._getnative": "^3.0.0"
 					}
 				},
 				"lodash._createset": {
@@ -5519,8 +5538,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"pseudomap": "1.0.2",
-						"yallist": "2.1.2"
+						"pseudomap": "^1.0.2",
+						"yallist": "^2.1.2"
 					}
 				},
 				"make-dir": {
@@ -5528,7 +5547,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"pify": "3.0.0"
+						"pify": "^3.0.0"
 					}
 				},
 				"make-fetch-happen": {
@@ -5536,17 +5555,17 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"agentkeepalive": "3.4.1",
-						"cacache": "11.3.2",
-						"http-cache-semantics": "3.8.1",
-						"http-proxy-agent": "2.1.0",
-						"https-proxy-agent": "2.2.1",
-						"lru-cache": "4.1.5",
-						"mississippi": "3.0.0",
-						"node-fetch-npm": "2.0.2",
-						"promise-retry": "1.1.1",
-						"socks-proxy-agent": "4.0.1",
-						"ssri": "6.0.1"
+						"agentkeepalive": "^3.4.1",
+						"cacache": "^11.0.1",
+						"http-cache-semantics": "^3.8.1",
+						"http-proxy-agent": "^2.1.0",
+						"https-proxy-agent": "^2.2.1",
+						"lru-cache": "^4.1.2",
+						"mississippi": "^3.0.0",
+						"node-fetch-npm": "^2.0.2",
+						"promise-retry": "^1.1.1",
+						"socks-proxy-agent": "^4.0.0",
+						"ssri": "^6.0.0"
 					}
 				},
 				"meant": {
@@ -5559,7 +5578,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"mimic-fn": "1.2.0"
+						"mimic-fn": "^1.0.0"
 					}
 				},
 				"mime-db": {
@@ -5572,7 +5591,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"mime-db": "1.35.0"
+						"mime-db": "~1.35.0"
 					}
 				},
 				"mimic-fn": {
@@ -5585,7 +5604,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"brace-expansion": "1.1.11"
+						"brace-expansion": "^1.1.7"
 					}
 				},
 				"minimist": {
@@ -5598,8 +5617,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"safe-buffer": "5.1.2",
-						"yallist": "3.0.2"
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.0"
 					},
 					"dependencies": {
 						"yallist": {
@@ -5614,7 +5633,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"minipass": "2.3.3"
+						"minipass": "^2.2.1"
 					}
 				},
 				"mississippi": {
@@ -5622,16 +5641,16 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"concat-stream": "1.6.2",
-						"duplexify": "3.6.0",
-						"end-of-stream": "1.4.1",
-						"flush-write-stream": "1.0.3",
-						"from2": "2.3.0",
-						"parallel-transform": "1.1.0",
-						"pump": "3.0.0",
-						"pumpify": "1.5.1",
-						"stream-each": "1.2.2",
-						"through2": "2.0.3"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
 					}
 				},
 				"mkdirp": {
@@ -5647,12 +5666,12 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "1.2.0",
-						"copy-concurrently": "1.0.5",
-						"fs-write-stream-atomic": "1.0.10",
-						"mkdirp": "0.5.1",
-						"rimraf": "2.6.3",
-						"run-queue": "1.0.3"
+						"aproba": "^1.1.1",
+						"copy-concurrently": "^1.0.0",
+						"fs-write-stream-atomic": "^1.0.8",
+						"mkdirp": "^0.5.1",
+						"rimraf": "^2.5.4",
+						"run-queue": "^1.0.3"
 					},
 					"dependencies": {
 						"aproba": {
@@ -5677,9 +5696,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"encoding": "0.1.12",
-						"json-parse-better-errors": "1.0.2",
-						"safe-buffer": "5.1.2"
+						"encoding": "^0.1.11",
+						"json-parse-better-errors": "^1.0.0",
+						"safe-buffer": "^5.1.1"
 					}
 				},
 				"node-gyp": {
@@ -5687,18 +5706,18 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"fstream": "1.0.11",
-						"glob": "7.1.3",
-						"graceful-fs": "4.1.15",
-						"mkdirp": "0.5.1",
-						"nopt": "3.0.6",
-						"npmlog": "4.1.2",
-						"osenv": "0.1.5",
-						"request": "2.88.0",
-						"rimraf": "2.6.3",
-						"semver": "5.3.0",
-						"tar": "2.2.1",
-						"which": "1.3.1"
+						"fstream": "^1.0.0",
+						"glob": "^7.0.3",
+						"graceful-fs": "^4.1.2",
+						"mkdirp": "^0.5.0",
+						"nopt": "2 || 3",
+						"npmlog": "0 || 1 || 2 || 3 || 4",
+						"osenv": "0",
+						"request": "^2.87.0",
+						"rimraf": "2",
+						"semver": "~5.3.0",
+						"tar": "^2.0.0",
+						"which": "1"
 					},
 					"dependencies": {
 						"nopt": {
@@ -5706,7 +5725,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"abbrev": "1.1.1"
+								"abbrev": "1"
 							}
 						},
 						"semver": {
@@ -5719,9 +5738,9 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"block-stream": "0.0.9",
-								"fstream": "1.0.11",
-								"inherits": "2.0.3"
+								"block-stream": "*",
+								"fstream": "^1.0.2",
+								"inherits": "2"
 							}
 						}
 					}
@@ -5731,8 +5750,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"abbrev": "1.1.1",
-						"osenv": "0.1.5"
+						"abbrev": "1",
+						"osenv": "^0.1.4"
 					}
 				},
 				"normalize-package-data": {
@@ -5740,10 +5759,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"hosted-git-info": "2.7.1",
-						"resolve": "1.10.0",
-						"semver": "5.6.0",
-						"validate-npm-package-license": "3.0.4"
+						"hosted-git-info": "^2.1.4",
+						"resolve": "^1.10.0",
+						"semver": "2 || 3 || 4 || 5",
+						"validate-npm-package-license": "^3.0.1"
 					},
 					"dependencies": {
 						"resolve": {
@@ -5751,7 +5770,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"path-parse": "1.0.6"
+								"path-parse": "^1.0.6"
 							}
 						}
 					}
@@ -5761,8 +5780,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"cli-table3": "0.5.1",
-						"console-control-strings": "1.1.0"
+						"cli-table3": "^0.5.0",
+						"console-control-strings": "^1.1.0"
 					}
 				},
 				"npm-bundled": {
@@ -5780,7 +5799,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"semver": "5.6.0"
+						"semver": "^2.3.0 || 3.x || 4 || 5"
 					}
 				},
 				"npm-lifecycle": {
@@ -5788,14 +5807,14 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"byline": "5.0.0",
-						"graceful-fs": "4.1.15",
-						"node-gyp": "3.8.0",
-						"resolve-from": "4.0.0",
-						"slide": "1.1.6",
+						"byline": "^5.0.0",
+						"graceful-fs": "^4.1.11",
+						"node-gyp": "^3.8.0",
+						"resolve-from": "^4.0.0",
+						"slide": "^1.1.6",
 						"uid-number": "0.0.6",
-						"umask": "1.1.0",
-						"which": "1.3.1"
+						"umask": "^1.1.0",
+						"which": "^1.3.1"
 					}
 				},
 				"npm-logical-tree": {
@@ -5808,10 +5827,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"hosted-git-info": "2.7.1",
-						"osenv": "0.1.5",
-						"semver": "5.6.0",
-						"validate-npm-package-name": "3.0.0"
+						"hosted-git-info": "^2.6.0",
+						"osenv": "^0.1.5",
+						"semver": "^5.5.0",
+						"validate-npm-package-name": "^3.0.0"
 					}
 				},
 				"npm-packlist": {
@@ -5819,8 +5838,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ignore-walk": "3.0.1",
-						"npm-bundled": "1.0.6"
+						"ignore-walk": "^3.0.1",
+						"npm-bundled": "^1.0.1"
 					}
 				},
 				"npm-pick-manifest": {
@@ -5828,9 +5847,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"figgy-pudding": "3.5.1",
-						"npm-package-arg": "6.1.0",
-						"semver": "5.6.0"
+						"figgy-pudding": "^3.5.1",
+						"npm-package-arg": "^6.0.0",
+						"semver": "^5.4.1"
 					}
 				},
 				"npm-profile": {
@@ -5838,9 +5857,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "2.0.0",
-						"figgy-pudding": "3.5.1",
-						"npm-registry-fetch": "3.9.0"
+						"aproba": "^1.1.2 || 2",
+						"figgy-pudding": "^3.4.1",
+						"npm-registry-fetch": "^3.8.0"
 					}
 				},
 				"npm-registry-fetch": {
@@ -5848,12 +5867,12 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"JSONStream": "1.3.5",
-						"bluebird": "3.5.3",
-						"figgy-pudding": "3.5.1",
-						"lru-cache": "4.1.5",
-						"make-fetch-happen": "4.0.1",
-						"npm-package-arg": "6.1.0"
+						"JSONStream": "^1.3.4",
+						"bluebird": "^3.5.1",
+						"figgy-pudding": "^3.4.1",
+						"lru-cache": "^4.1.3",
+						"make-fetch-happen": "^4.0.1",
+						"npm-package-arg": "^6.1.0"
 					}
 				},
 				"npm-run-path": {
@@ -5861,7 +5880,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"path-key": "2.0.1"
+						"path-key": "^2.0.0"
 					}
 				},
 				"npm-user-validate": {
@@ -5874,10 +5893,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"are-we-there-yet": "1.1.4",
-						"console-control-strings": "1.1.0",
-						"gauge": "2.7.4",
-						"set-blocking": "2.0.0"
+						"are-we-there-yet": "~1.1.2",
+						"console-control-strings": "~1.1.0",
+						"gauge": "~2.7.3",
+						"set-blocking": "~2.0.0"
 					}
 				},
 				"number-is-nan": {
@@ -5900,7 +5919,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"wrappy": "1.0.2"
+						"wrappy": "1"
 					}
 				},
 				"opener": {
@@ -5918,9 +5937,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"execa": "0.7.0",
-						"lcid": "1.0.0",
-						"mem": "1.1.0"
+						"execa": "^0.7.0",
+						"lcid": "^1.0.0",
+						"mem": "^1.1.0"
 					}
 				},
 				"os-tmpdir": {
@@ -5933,8 +5952,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"os-homedir": "1.0.2",
-						"os-tmpdir": "1.0.2"
+						"os-homedir": "^1.0.0",
+						"os-tmpdir": "^1.0.0"
 					}
 				},
 				"p-finally": {
@@ -5947,7 +5966,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"p-try": "1.0.0"
+						"p-try": "^1.0.0"
 					}
 				},
 				"p-locate": {
@@ -5955,7 +5974,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"p-limit": "1.2.0"
+						"p-limit": "^1.1.0"
 					}
 				},
 				"p-try": {
@@ -5968,10 +5987,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"got": "6.7.1",
-						"registry-auth-token": "3.3.2",
-						"registry-url": "3.1.0",
-						"semver": "5.6.0"
+						"got": "^6.7.1",
+						"registry-auth-token": "^3.0.1",
+						"registry-url": "^3.0.3",
+						"semver": "^5.1.0"
 					}
 				},
 				"pacote": {
@@ -5979,33 +5998,33 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"bluebird": "3.5.3",
-						"cacache": "11.3.2",
-						"figgy-pudding": "3.5.1",
-						"get-stream": "4.1.0",
-						"glob": "7.1.3",
-						"lru-cache": "5.1.1",
-						"make-fetch-happen": "4.0.1",
-						"minimatch": "3.0.4",
-						"minipass": "2.3.5",
-						"mississippi": "3.0.0",
-						"mkdirp": "0.5.1",
-						"normalize-package-data": "2.5.0",
-						"npm-package-arg": "6.1.0",
-						"npm-packlist": "1.4.1",
-						"npm-pick-manifest": "2.2.3",
-						"npm-registry-fetch": "3.9.0",
-						"osenv": "0.1.5",
-						"promise-inflight": "1.0.1",
-						"promise-retry": "1.1.1",
-						"protoduck": "5.0.1",
-						"rimraf": "2.6.3",
-						"safe-buffer": "5.1.2",
-						"semver": "5.6.0",
-						"ssri": "6.0.1",
-						"tar": "4.4.8",
-						"unique-filename": "1.1.1",
-						"which": "1.3.1"
+						"bluebird": "^3.5.3",
+						"cacache": "^11.3.2",
+						"figgy-pudding": "^3.5.1",
+						"get-stream": "^4.1.0",
+						"glob": "^7.1.3",
+						"lru-cache": "^5.1.1",
+						"make-fetch-happen": "^4.0.1",
+						"minimatch": "^3.0.4",
+						"minipass": "^2.3.5",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"normalize-package-data": "^2.4.0",
+						"npm-package-arg": "^6.1.0",
+						"npm-packlist": "^1.1.12",
+						"npm-pick-manifest": "^2.2.3",
+						"npm-registry-fetch": "^3.8.0",
+						"osenv": "^0.1.5",
+						"promise-inflight": "^1.0.1",
+						"promise-retry": "^1.1.1",
+						"protoduck": "^5.0.1",
+						"rimraf": "^2.6.2",
+						"safe-buffer": "^5.1.2",
+						"semver": "^5.6.0",
+						"ssri": "^6.0.1",
+						"tar": "^4.4.8",
+						"unique-filename": "^1.1.1",
+						"which": "^1.3.1"
 					},
 					"dependencies": {
 						"lru-cache": {
@@ -6013,7 +6032,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"yallist": "3.0.3"
+								"yallist": "^3.0.2"
 							}
 						},
 						"minipass": {
@@ -6021,8 +6040,8 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2",
-								"yallist": "3.0.3"
+								"safe-buffer": "^5.1.2",
+								"yallist": "^3.0.0"
 							}
 						},
 						"yallist": {
@@ -6037,9 +6056,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"cyclist": "0.2.2",
-						"inherits": "2.0.3",
-						"readable-stream": "2.3.6"
+						"cyclist": "~0.2.2",
+						"inherits": "^2.0.3",
+						"readable-stream": "^2.1.5"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -6047,13 +6066,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -6061,7 +6080,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -6121,8 +6140,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"err-code": "1.1.2",
-						"retry": "0.10.1"
+						"err-code": "^1.0.0",
+						"retry": "^0.10.0"
 					},
 					"dependencies": {
 						"retry": {
@@ -6137,7 +6156,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"read": "1.0.7"
+						"read": "1"
 					}
 				},
 				"proto-list": {
@@ -6150,7 +6169,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"genfun": "5.0.0"
+						"genfun": "^5.0.0"
 					}
 				},
 				"prr": {
@@ -6173,8 +6192,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"end-of-stream": "1.4.1",
-						"once": "1.4.0"
+						"end-of-stream": "^1.1.0",
+						"once": "^1.3.1"
 					}
 				},
 				"pumpify": {
@@ -6182,9 +6201,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"duplexify": "3.6.0",
-						"inherits": "2.0.3",
-						"pump": "2.0.1"
+						"duplexify": "^3.6.0",
+						"inherits": "^2.0.3",
+						"pump": "^2.0.0"
 					},
 					"dependencies": {
 						"pump": {
@@ -6192,8 +6211,8 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"end-of-stream": "1.4.1",
-								"once": "1.4.0"
+								"end-of-stream": "^1.1.0",
+								"once": "^1.3.1"
 							}
 						}
 					}
@@ -6218,8 +6237,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"decode-uri-component": "0.2.0",
-						"strict-uri-encode": "2.0.0"
+						"decode-uri-component": "^0.2.0",
+						"strict-uri-encode": "^2.0.0"
 					}
 				},
 				"qw": {
@@ -6232,10 +6251,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"deep-extend": "0.5.1",
-						"ini": "1.3.5",
-						"minimist": "1.2.0",
-						"strip-json-comments": "2.0.1"
+						"deep-extend": "^0.5.1",
+						"ini": "~1.3.0",
+						"minimist": "^1.2.0",
+						"strip-json-comments": "~2.0.1"
 					},
 					"dependencies": {
 						"minimist": {
@@ -6250,7 +6269,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"mute-stream": "0.0.7"
+						"mute-stream": "~0.0.4"
 					}
 				},
 				"read-cmd-shim": {
@@ -6258,7 +6277,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"graceful-fs": "4.1.15"
+						"graceful-fs": "^4.1.2"
 					}
 				},
 				"read-installed": {
@@ -6266,13 +6285,13 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"debuglog": "1.0.1",
-						"graceful-fs": "4.1.15",
-						"read-package-json": "2.0.13",
-						"readdir-scoped-modules": "1.0.2",
-						"semver": "5.6.0",
-						"slide": "1.1.6",
-						"util-extend": "1.0.3"
+						"debuglog": "^1.0.1",
+						"graceful-fs": "^4.1.2",
+						"read-package-json": "^2.0.0",
+						"readdir-scoped-modules": "^1.0.0",
+						"semver": "2 || 3 || 4 || 5",
+						"slide": "~1.1.3",
+						"util-extend": "^1.0.1"
 					}
 				},
 				"read-package-json": {
@@ -6280,11 +6299,11 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"glob": "7.1.3",
-						"graceful-fs": "4.1.15",
-						"json-parse-better-errors": "1.0.2",
-						"normalize-package-data": "2.5.0",
-						"slash": "1.0.0"
+						"glob": "^7.1.1",
+						"graceful-fs": "^4.1.2",
+						"json-parse-better-errors": "^1.0.1",
+						"normalize-package-data": "^2.0.0",
+						"slash": "^1.0.0"
 					}
 				},
 				"read-package-tree": {
@@ -6292,11 +6311,11 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"debuglog": "1.0.1",
-						"dezalgo": "1.0.3",
-						"once": "1.4.0",
-						"read-package-json": "2.0.13",
-						"readdir-scoped-modules": "1.0.2"
+						"debuglog": "^1.0.1",
+						"dezalgo": "^1.0.0",
+						"once": "^1.3.0",
+						"read-package-json": "^2.0.0",
+						"readdir-scoped-modules": "^1.0.0"
 					}
 				},
 				"readable-stream": {
@@ -6304,9 +6323,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"inherits": "2.0.3",
-						"string_decoder": "1.2.0",
-						"util-deprecate": "1.0.2"
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
 				},
 				"readdir-scoped-modules": {
@@ -6314,10 +6333,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"debuglog": "1.0.1",
-						"dezalgo": "1.0.3",
-						"graceful-fs": "4.1.15",
-						"once": "1.4.0"
+						"debuglog": "^1.0.1",
+						"dezalgo": "^1.0.0",
+						"graceful-fs": "^4.1.2",
+						"once": "^1.3.0"
 					}
 				},
 				"registry-auth-token": {
@@ -6325,8 +6344,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"rc": "1.2.7",
-						"safe-buffer": "5.1.2"
+						"rc": "^1.1.6",
+						"safe-buffer": "^5.0.1"
 					}
 				},
 				"registry-url": {
@@ -6334,7 +6353,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"rc": "1.2.7"
+						"rc": "^1.0.1"
 					}
 				},
 				"request": {
@@ -6342,26 +6361,26 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aws-sign2": "0.7.0",
-						"aws4": "1.8.0",
-						"caseless": "0.12.0",
-						"combined-stream": "1.0.6",
-						"extend": "3.0.2",
-						"forever-agent": "0.6.1",
-						"form-data": "2.3.2",
-						"har-validator": "5.1.0",
-						"http-signature": "1.2.0",
-						"is-typedarray": "1.0.0",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.1.19",
-						"oauth-sign": "0.9.0",
-						"performance-now": "2.1.0",
-						"qs": "6.5.2",
-						"safe-buffer": "5.1.2",
-						"tough-cookie": "2.4.3",
-						"tunnel-agent": "0.6.0",
-						"uuid": "3.3.2"
+						"aws-sign2": "~0.7.0",
+						"aws4": "^1.8.0",
+						"caseless": "~0.12.0",
+						"combined-stream": "~1.0.6",
+						"extend": "~3.0.2",
+						"forever-agent": "~0.6.1",
+						"form-data": "~2.3.2",
+						"har-validator": "~5.1.0",
+						"http-signature": "~1.2.0",
+						"is-typedarray": "~1.0.0",
+						"isstream": "~0.1.2",
+						"json-stringify-safe": "~5.0.1",
+						"mime-types": "~2.1.19",
+						"oauth-sign": "~0.9.0",
+						"performance-now": "^2.1.0",
+						"qs": "~6.5.2",
+						"safe-buffer": "^5.1.2",
+						"tough-cookie": "~2.4.3",
+						"tunnel-agent": "^0.6.0",
+						"uuid": "^3.3.2"
 					}
 				},
 				"require-directory": {
@@ -6389,7 +6408,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"glob": "7.1.3"
+						"glob": "^7.1.3"
 					}
 				},
 				"run-queue": {
@@ -6397,7 +6416,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "1.2.0"
+						"aproba": "^1.1.1"
 					},
 					"dependencies": {
 						"aproba": {
@@ -6427,7 +6446,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"semver": "5.6.0"
+						"semver": "^5.0.3"
 					}
 				},
 				"set-blocking": {
@@ -6440,8 +6459,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"graceful-fs": "4.1.15",
-						"readable-stream": "2.3.6"
+						"graceful-fs": "^4.1.2",
+						"readable-stream": "^2.0.2"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -6449,13 +6468,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -6463,7 +6482,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -6473,7 +6492,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"shebang-regex": "1.0.0"
+						"shebang-regex": "^1.0.0"
 					}
 				},
 				"shebang-regex": {
@@ -6506,8 +6525,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ip": "1.1.5",
-						"smart-buffer": "4.0.1"
+						"ip": "^1.1.5",
+						"smart-buffer": "^4.0.1"
 					}
 				},
 				"socks-proxy-agent": {
@@ -6515,8 +6534,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"agent-base": "4.2.1",
-						"socks": "2.2.0"
+						"agent-base": "~4.2.0",
+						"socks": "~2.2.0"
 					}
 				},
 				"sorted-object": {
@@ -6529,8 +6548,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"from2": "1.3.0",
-						"stream-iterate": "1.2.0"
+						"from2": "^1.3.0",
+						"stream-iterate": "^1.1.0"
 					},
 					"dependencies": {
 						"from2": {
@@ -6538,8 +6557,8 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"inherits": "2.0.3",
-								"readable-stream": "1.1.14"
+								"inherits": "~2.0.1",
+								"readable-stream": "~1.1.10"
 							}
 						},
 						"isarray": {
@@ -6552,10 +6571,10 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.1",
 								"isarray": "0.0.1",
-								"string_decoder": "0.10.31"
+								"string_decoder": "~0.10.x"
 							}
 						},
 						"string_decoder": {
@@ -6570,8 +6589,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"spdx-expression-parse": "3.0.0",
-						"spdx-license-ids": "3.0.3"
+						"spdx-expression-parse": "^3.0.0",
+						"spdx-license-ids": "^3.0.0"
 					}
 				},
 				"spdx-exceptions": {
@@ -6584,8 +6603,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"spdx-exceptions": "2.1.0",
-						"spdx-license-ids": "3.0.3"
+						"spdx-exceptions": "^2.1.0",
+						"spdx-license-ids": "^3.0.0"
 					}
 				},
 				"spdx-license-ids": {
@@ -6598,15 +6617,15 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"asn1": "0.2.4",
-						"assert-plus": "1.0.0",
-						"bcrypt-pbkdf": "1.0.2",
-						"dashdash": "1.14.1",
-						"ecc-jsbn": "0.1.2",
-						"getpass": "0.1.7",
-						"jsbn": "0.1.1",
-						"safer-buffer": "2.1.2",
-						"tweetnacl": "0.14.5"
+						"asn1": "~0.2.3",
+						"assert-plus": "^1.0.0",
+						"bcrypt-pbkdf": "^1.0.0",
+						"dashdash": "^1.12.0",
+						"ecc-jsbn": "~0.1.1",
+						"getpass": "^0.1.1",
+						"jsbn": "~0.1.0",
+						"safer-buffer": "^2.0.2",
+						"tweetnacl": "~0.14.0"
 					}
 				},
 				"ssri": {
@@ -6614,7 +6633,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"figgy-pudding": "3.5.1"
+						"figgy-pudding": "^3.5.1"
 					}
 				},
 				"stream-each": {
@@ -6622,8 +6641,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"end-of-stream": "1.4.1",
-						"stream-shift": "1.0.0"
+						"end-of-stream": "^1.1.0",
+						"stream-shift": "^1.0.0"
 					}
 				},
 				"stream-iterate": {
@@ -6631,8 +6650,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"readable-stream": "2.3.6",
-						"stream-shift": "1.0.0"
+						"readable-stream": "^2.1.5",
+						"stream-shift": "^1.0.0"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -6640,13 +6659,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -6654,7 +6673,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -6674,8 +6693,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"is-fullwidth-code-point": "2.0.0",
-						"strip-ansi": "4.0.0"
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^4.0.0"
 					},
 					"dependencies": {
 						"ansi-regex": {
@@ -6693,7 +6712,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"ansi-regex": "3.0.0"
+								"ansi-regex": "^3.0.0"
 							}
 						}
 					}
@@ -6703,7 +6722,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"safe-buffer": "5.1.2"
+						"safe-buffer": "~5.1.0"
 					}
 				},
 				"stringify-package": {
@@ -6716,7 +6735,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ansi-regex": "2.1.1"
+						"ansi-regex": "^2.0.0"
 					}
 				},
 				"strip-eof": {
@@ -6734,7 +6753,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"has-flag": "3.0.0"
+						"has-flag": "^3.0.0"
 					}
 				},
 				"tar": {
@@ -6742,13 +6761,13 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"chownr": "1.1.1",
-						"fs-minipass": "1.2.5",
-						"minipass": "2.3.5",
-						"minizlib": "1.1.1",
-						"mkdirp": "0.5.1",
-						"safe-buffer": "5.1.2",
-						"yallist": "3.0.3"
+						"chownr": "^1.1.1",
+						"fs-minipass": "^1.2.5",
+						"minipass": "^2.3.4",
+						"minizlib": "^1.1.1",
+						"mkdirp": "^0.5.0",
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.2"
 					},
 					"dependencies": {
 						"chownr": {
@@ -6761,8 +6780,8 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2",
-								"yallist": "3.0.3"
+								"safe-buffer": "^5.1.2",
+								"yallist": "^3.0.0"
 							}
 						},
 						"yallist": {
@@ -6777,7 +6796,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"execa": "0.7.0"
+						"execa": "^0.7.0"
 					}
 				},
 				"text-table": {
@@ -6795,8 +6814,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"readable-stream": "2.3.6",
-						"xtend": "4.0.1"
+						"readable-stream": "^2.1.5",
+						"xtend": "~4.0.1"
 					},
 					"dependencies": {
 						"readable-stream": {
@@ -6804,13 +6823,13 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "1.0.0",
-								"process-nextick-args": "2.0.0",
-								"safe-buffer": "5.1.2",
-								"string_decoder": "1.1.1",
-								"util-deprecate": "1.0.2"
+								"core-util-is": "~1.0.0",
+								"inherits": "~2.0.3",
+								"isarray": "~1.0.0",
+								"process-nextick-args": "~2.0.0",
+								"safe-buffer": "~5.1.1",
+								"string_decoder": "~1.1.1",
+								"util-deprecate": "~1.0.1"
 							}
 						},
 						"string_decoder": {
@@ -6818,7 +6837,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"safe-buffer": "5.1.2"
+								"safe-buffer": "~5.1.0"
 							}
 						}
 					}
@@ -6838,8 +6857,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"psl": "1.1.29",
-						"punycode": "1.4.1"
+						"psl": "^1.1.24",
+						"punycode": "^1.4.1"
 					}
 				},
 				"tunnel-agent": {
@@ -6847,7 +6866,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"safe-buffer": "5.1.2"
+						"safe-buffer": "^5.0.1"
 					}
 				},
 				"tweetnacl": {
@@ -6876,7 +6895,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"unique-slug": "2.0.0"
+						"unique-slug": "^2.0.0"
 					}
 				},
 				"unique-slug": {
@@ -6884,7 +6903,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"imurmurhash": "0.1.4"
+						"imurmurhash": "^0.1.4"
 					}
 				},
 				"unique-string": {
@@ -6892,7 +6911,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"crypto-random-string": "1.0.0"
+						"crypto-random-string": "^1.0.0"
 					}
 				},
 				"unpipe": {
@@ -6910,16 +6929,16 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"boxen": "1.3.0",
-						"chalk": "2.4.1",
-						"configstore": "3.1.2",
-						"import-lazy": "2.1.0",
-						"is-ci": "1.1.0",
-						"is-installed-globally": "0.1.0",
-						"is-npm": "1.0.0",
-						"latest-version": "3.1.0",
-						"semver-diff": "2.1.0",
-						"xdg-basedir": "3.0.0"
+						"boxen": "^1.2.1",
+						"chalk": "^2.0.1",
+						"configstore": "^3.0.0",
+						"import-lazy": "^2.1.0",
+						"is-ci": "^1.0.10",
+						"is-installed-globally": "^0.1.0",
+						"is-npm": "^1.0.0",
+						"latest-version": "^3.0.0",
+						"semver-diff": "^2.0.0",
+						"xdg-basedir": "^3.0.0"
 					}
 				},
 				"url-parse-lax": {
@@ -6927,7 +6946,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"prepend-http": "1.0.4"
+						"prepend-http": "^1.0.1"
 					}
 				},
 				"util-deprecate": {
@@ -6950,8 +6969,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"spdx-correct": "3.0.0",
-						"spdx-expression-parse": "3.0.0"
+						"spdx-correct": "^3.0.0",
+						"spdx-expression-parse": "^3.0.0"
 					}
 				},
 				"validate-npm-package-name": {
@@ -6959,7 +6978,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"builtins": "1.0.3"
+						"builtins": "^1.0.3"
 					}
 				},
 				"verror": {
@@ -6967,9 +6986,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"assert-plus": "1.0.0",
+						"assert-plus": "^1.0.0",
 						"core-util-is": "1.0.2",
-						"extsprintf": "1.3.0"
+						"extsprintf": "^1.2.0"
 					}
 				},
 				"wcwidth": {
@@ -6977,7 +6996,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"defaults": "1.0.3"
+						"defaults": "^1.0.3"
 					}
 				},
 				"which": {
@@ -6985,7 +7004,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"isexe": "2.0.0"
+						"isexe": "^2.0.0"
 					}
 				},
 				"which-module": {
@@ -6998,7 +7017,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"string-width": "1.0.2"
+						"string-width": "^1.0.2"
 					},
 					"dependencies": {
 						"string-width": {
@@ -7006,9 +7025,9 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"code-point-at": "1.1.0",
-								"is-fullwidth-code-point": "1.0.0",
-								"strip-ansi": "3.0.1"
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
 							}
 						}
 					}
@@ -7018,7 +7037,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"string-width": "2.1.1"
+						"string-width": "^2.1.1"
 					}
 				},
 				"worker-farm": {
@@ -7026,7 +7045,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"errno": "0.1.7"
+						"errno": "~0.1.7"
 					}
 				},
 				"wrap-ansi": {
@@ -7034,8 +7053,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"string-width": "1.0.2",
-						"strip-ansi": "3.0.1"
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1"
 					},
 					"dependencies": {
 						"string-width": {
@@ -7043,9 +7062,9 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"code-point-at": "1.1.0",
-								"is-fullwidth-code-point": "1.0.0",
-								"strip-ansi": "3.0.1"
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
 							}
 						}
 					}
@@ -7060,9 +7079,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"graceful-fs": "4.1.15",
-						"imurmurhash": "0.1.4",
-						"signal-exit": "3.0.2"
+						"graceful-fs": "^4.1.11",
+						"imurmurhash": "^0.1.4",
+						"signal-exit": "^3.0.2"
 					}
 				},
 				"xdg-basedir": {
@@ -7090,18 +7109,18 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"cliui": "4.1.0",
-						"decamelize": "1.2.0",
-						"find-up": "2.1.0",
-						"get-caller-file": "1.0.2",
-						"os-locale": "2.1.0",
-						"require-directory": "2.1.1",
-						"require-main-filename": "1.0.1",
-						"set-blocking": "2.0.0",
-						"string-width": "2.1.1",
-						"which-module": "2.0.0",
-						"y18n": "3.2.1",
-						"yargs-parser": "9.0.2"
+						"cliui": "^4.0.0",
+						"decamelize": "^1.1.1",
+						"find-up": "^2.1.0",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^2.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1",
+						"yargs-parser": "^9.0.2"
 					},
 					"dependencies": {
 						"y18n": {
@@ -7116,7 +7135,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"camelcase": "4.1.0"
+						"camelcase": "^4.1.0"
 					}
 				}
 			}
@@ -7145,9 +7164,9 @@
 			"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
 			"dev": true,
 			"requires": {
-				"copy-descriptor": "0.1.1",
-				"define-property": "0.2.5",
-				"kind-of": "3.2.2"
+				"copy-descriptor": "^0.1.0",
+				"define-property": "^0.2.5",
+				"kind-of": "^3.0.3"
 			},
 			"dependencies": {
 				"define-property": {
@@ -7156,7 +7175,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "0.1.6"
+						"is-descriptor": "^0.1.0"
 					}
 				},
 				"kind-of": {
@@ -7165,7 +7184,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "1.1.6"
+						"is-buffer": "^1.1.5"
 					}
 				}
 			}
@@ -7182,7 +7201,7 @@
 			"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
 			"dev": true,
 			"requires": {
-				"isobject": "3.0.1"
+				"isobject": "^3.0.0"
 			}
 		},
 		"object.assign": {
@@ -7191,10 +7210,10 @@
 			"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
 			"dev": true,
 			"requires": {
-				"define-properties": "1.1.3",
-				"function-bind": "1.1.1",
-				"has-symbols": "1.0.0",
-				"object-keys": "1.1.1"
+				"define-properties": "^1.1.2",
+				"function-bind": "^1.1.1",
+				"has-symbols": "^1.0.0",
+				"object-keys": "^1.0.11"
 			}
 		},
 		"object.defaults": {
@@ -7203,10 +7222,10 @@
 			"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
 			"dev": true,
 			"requires": {
-				"array-each": "1.0.1",
-				"array-slice": "1.1.0",
-				"for-own": "1.0.0",
-				"isobject": "3.0.1"
+				"array-each": "^1.0.1",
+				"array-slice": "^1.0.0",
+				"for-own": "^1.0.0",
+				"isobject": "^3.0.0"
 			}
 		},
 		"object.map": {
@@ -7215,8 +7234,8 @@
 			"integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
 			"dev": true,
 			"requires": {
-				"for-own": "1.0.0",
-				"make-iterator": "1.0.1"
+				"for-own": "^1.0.0",
+				"make-iterator": "^1.0.0"
 			}
 		},
 		"object.pick": {
@@ -7225,7 +7244,7 @@
 			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
 			"dev": true,
 			"requires": {
-				"isobject": "3.0.1"
+				"isobject": "^3.0.1"
 			}
 		},
 		"object.reduce": {
@@ -7234,8 +7253,8 @@
 			"integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
 			"dev": true,
 			"requires": {
-				"for-own": "1.0.0",
-				"make-iterator": "1.0.1"
+				"for-own": "^1.0.0",
+				"make-iterator": "^1.0.0"
 			}
 		},
 		"once": {
@@ -7244,7 +7263,7 @@
 			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 			"dev": true,
 			"requires": {
-				"wrappy": "1.0.2"
+				"wrappy": "1"
 			}
 		},
 		"onetime": {
@@ -7253,7 +7272,7 @@
 			"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
 			"dev": true,
 			"requires": {
-				"mimic-fn": "1.2.0"
+				"mimic-fn": "^1.0.0"
 			}
 		},
 		"optionator": {
@@ -7262,12 +7281,12 @@
 			"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
 			"dev": true,
 			"requires": {
-				"deep-is": "0.1.3",
-				"fast-levenshtein": "2.0.6",
-				"levn": "0.3.0",
-				"prelude-ls": "1.1.2",
-				"type-check": "0.3.2",
-				"wordwrap": "1.0.0"
+				"deep-is": "~0.1.3",
+				"fast-levenshtein": "~2.0.4",
+				"levn": "~0.3.0",
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2",
+				"wordwrap": "~1.0.0"
 			}
 		},
 		"ordered-read-streams": {
@@ -7276,7 +7295,7 @@
 			"integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
 			"dev": true,
 			"requires": {
-				"readable-stream": "2.3.6"
+				"readable-stream": "^2.0.1"
 			}
 		},
 		"os-locale": {
@@ -7285,7 +7304,7 @@
 			"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
 			"dev": true,
 			"requires": {
-				"lcid": "1.0.0"
+				"lcid": "^1.0.0"
 			}
 		},
 		"os-tmpdir": {
@@ -7300,7 +7319,7 @@
 			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
 			"dev": true,
 			"requires": {
-				"callsites": "3.1.0"
+				"callsites": "^3.0.0"
 			}
 		},
 		"parse-filepath": {
@@ -7309,9 +7328,9 @@
 			"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
 			"dev": true,
 			"requires": {
-				"is-absolute": "1.0.0",
-				"map-cache": "0.2.2",
-				"path-root": "0.1.1"
+				"is-absolute": "^1.0.0",
+				"map-cache": "^0.2.0",
+				"path-root": "^0.1.1"
 			}
 		},
 		"parse-json": {
@@ -7320,7 +7339,7 @@
 			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
 			"dev": true,
 			"requires": {
-				"error-ex": "1.3.2"
+				"error-ex": "^1.2.0"
 			}
 		},
 		"parse-node-version": {
@@ -7353,7 +7372,7 @@
 			"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
 			"dev": true,
 			"requires": {
-				"pinkie-promise": "2.0.1"
+				"pinkie-promise": "^2.0.0"
 			}
 		},
 		"path-is-absolute": {
@@ -7386,7 +7405,7 @@
 			"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
 			"dev": true,
 			"requires": {
-				"path-root-regex": "0.1.2"
+				"path-root-regex": "^0.1.0"
 			}
 		},
 		"path-root-regex": {
@@ -7401,9 +7420,9 @@
 			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "4.1.15",
-				"pify": "2.3.0",
-				"pinkie-promise": "2.0.1"
+				"graceful-fs": "^4.1.2",
+				"pify": "^2.0.0",
+				"pinkie-promise": "^2.0.0"
 			}
 		},
 		"pify": {
@@ -7424,7 +7443,7 @@
 			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
 			"dev": true,
 			"requires": {
-				"pinkie": "2.0.4"
+				"pinkie": "^2.0.0"
 			}
 		},
 		"plugin-error": {
@@ -7433,11 +7452,11 @@
 			"integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
 			"dev": true,
 			"requires": {
-				"ansi-cyan": "0.1.1",
-				"ansi-red": "0.1.1",
-				"arr-diff": "1.1.0",
-				"arr-union": "2.1.0",
-				"extend-shallow": "1.1.4"
+				"ansi-cyan": "^0.1.1",
+				"ansi-red": "^0.1.1",
+				"arr-diff": "^1.0.1",
+				"arr-union": "^2.0.1",
+				"extend-shallow": "^1.1.2"
 			},
 			"dependencies": {
 				"arr-diff": {
@@ -7446,8 +7465,8 @@
 					"integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "1.1.0",
-						"array-slice": "0.2.3"
+						"arr-flatten": "^1.0.1",
+						"array-slice": "^0.2.3"
 					}
 				},
 				"arr-union": {
@@ -7468,7 +7487,7 @@
 					"integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
 					"dev": true,
 					"requires": {
-						"kind-of": "1.1.0"
+						"kind-of": "^1.1.0"
 					}
 				},
 				"kind-of": {
@@ -7515,8 +7534,8 @@
 			"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
 			"dev": true,
 			"requires": {
-				"end-of-stream": "1.4.1",
-				"once": "1.4.0"
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
 			}
 		},
 		"pumpify": {
@@ -7525,9 +7544,9 @@
 			"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
 			"dev": true,
 			"requires": {
-				"duplexify": "3.7.1",
-				"inherits": "2.0.3",
-				"pump": "2.0.1"
+				"duplexify": "^3.6.0",
+				"inherits": "^2.0.3",
+				"pump": "^2.0.0"
 			}
 		},
 		"punycode": {
@@ -7542,9 +7561,9 @@
 			"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
 			"dev": true,
 			"requires": {
-				"load-json-file": "1.1.0",
-				"normalize-package-data": "2.5.0",
-				"path-type": "1.1.0"
+				"load-json-file": "^1.0.0",
+				"normalize-package-data": "^2.3.2",
+				"path-type": "^1.0.0"
 			}
 		},
 		"read-pkg-up": {
@@ -7553,8 +7572,8 @@
 			"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
 			"dev": true,
 			"requires": {
-				"find-up": "1.1.2",
-				"read-pkg": "1.1.0"
+				"find-up": "^1.0.0",
+				"read-pkg": "^1.0.0"
 			}
 		},
 		"readable-stream": {
@@ -7563,13 +7582,13 @@
 			"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 			"dev": true,
 			"requires": {
-				"core-util-is": "1.0.2",
-				"inherits": "2.0.3",
-				"isarray": "1.0.0",
-				"process-nextick-args": "2.0.0",
-				"safe-buffer": "5.1.2",
-				"string_decoder": "1.1.1",
-				"util-deprecate": "1.0.2"
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
 			},
 			"dependencies": {
 				"process-nextick-args": {
@@ -7586,9 +7605,9 @@
 			"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "4.1.15",
-				"micromatch": "3.1.10",
-				"readable-stream": "2.3.6"
+				"graceful-fs": "^4.1.11",
+				"micromatch": "^3.1.10",
+				"readable-stream": "^2.0.2"
 			}
 		},
 		"rechoir": {
@@ -7597,7 +7616,7 @@
 			"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
 			"dev": true,
 			"requires": {
-				"resolve": "1.10.1"
+				"resolve": "^1.1.6"
 			}
 		},
 		"redent": {
@@ -7606,8 +7625,8 @@
 			"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
 			"dev": true,
 			"requires": {
-				"indent-string": "2.1.0",
-				"strip-indent": "1.0.1"
+				"indent-string": "^2.1.0",
+				"strip-indent": "^1.0.1"
 			}
 		},
 		"regex-not": {
@@ -7616,8 +7635,8 @@
 			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "3.0.2",
-				"safe-regex": "1.1.0"
+				"extend-shallow": "^3.0.2",
+				"safe-regex": "^1.1.0"
 			}
 		},
 		"regexpp": {
@@ -7632,8 +7651,8 @@
 			"integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
 			"dev": true,
 			"requires": {
-				"is-buffer": "1.1.6",
-				"is-utf8": "0.2.1"
+				"is-buffer": "^1.1.5",
+				"is-utf8": "^0.2.1"
 			}
 		},
 		"remove-bom-stream": {
@@ -7642,9 +7661,9 @@
 			"integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
 			"dev": true,
 			"requires": {
-				"remove-bom-buffer": "3.0.0",
-				"safe-buffer": "5.1.2",
-				"through2": "2.0.5"
+				"remove-bom-buffer": "^3.0.0",
+				"safe-buffer": "^5.1.0",
+				"through2": "^2.0.3"
 			}
 		},
 		"remove-trailing-separator": {
@@ -7671,7 +7690,7 @@
 			"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
 			"dev": true,
 			"requires": {
-				"is-finite": "1.0.2"
+				"is-finite": "^1.0.0"
 			}
 		},
 		"replace-ext": {
@@ -7686,9 +7705,9 @@
 			"integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
 			"dev": true,
 			"requires": {
-				"homedir-polyfill": "1.0.3",
-				"is-absolute": "1.0.0",
-				"remove-trailing-separator": "1.1.0"
+				"homedir-polyfill": "^1.0.1",
+				"is-absolute": "^1.0.0",
+				"remove-trailing-separator": "^1.1.0"
 			}
 		},
 		"require-directory": {
@@ -7709,7 +7728,7 @@
 			"integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==",
 			"dev": true,
 			"requires": {
-				"path-parse": "1.0.6"
+				"path-parse": "^1.0.6"
 			}
 		},
 		"resolve-dir": {
@@ -7718,8 +7737,8 @@
 			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
 			"dev": true,
 			"requires": {
-				"expand-tilde": "2.0.2",
-				"global-modules": "1.0.0"
+				"expand-tilde": "^2.0.0",
+				"global-modules": "^1.0.0"
 			}
 		},
 		"resolve-from": {
@@ -7734,7 +7753,7 @@
 			"integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
 			"dev": true,
 			"requires": {
-				"value-or-function": "3.0.0"
+				"value-or-function": "^3.0.0"
 			}
 		},
 		"resolve-url": {
@@ -7749,8 +7768,8 @@
 			"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
 			"dev": true,
 			"requires": {
-				"onetime": "2.0.1",
-				"signal-exit": "3.0.2"
+				"onetime": "^2.0.0",
+				"signal-exit": "^3.0.2"
 			}
 		},
 		"ret": {
@@ -7765,7 +7784,7 @@
 			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
 			"dev": true,
 			"requires": {
-				"glob": "7.1.4"
+				"glob": "^7.1.3"
 			}
 		},
 		"run-async": {
@@ -7774,7 +7793,7 @@
 			"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
 			"dev": true,
 			"requires": {
-				"is-promise": "2.1.0"
+				"is-promise": "^2.1.0"
 			}
 		},
 		"rxjs": {
@@ -7783,7 +7802,7 @@
 			"integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
 			"dev": true,
 			"requires": {
-				"tslib": "1.9.3"
+				"tslib": "^1.9.0"
 			}
 		},
 		"safe-buffer": {
@@ -7798,7 +7817,7 @@
 			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
 			"dev": true,
 			"requires": {
-				"ret": "0.1.15"
+				"ret": "~0.1.10"
 			}
 		},
 		"safer-buffer": {
@@ -7819,7 +7838,7 @@
 			"integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
 			"dev": true,
 			"requires": {
-				"sver-compat": "1.5.0"
+				"sver-compat": "^1.5.0"
 			}
 		},
 		"set-blocking": {
@@ -7834,10 +7853,10 @@
 			"integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "2.0.1",
-				"is-extendable": "0.1.1",
-				"is-plain-object": "2.0.4",
-				"split-string": "3.1.0"
+				"extend-shallow": "^2.0.1",
+				"is-extendable": "^0.1.1",
+				"is-plain-object": "^2.0.3",
+				"split-string": "^3.0.1"
 			},
 			"dependencies": {
 				"extend-shallow": {
@@ -7846,7 +7865,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "0.1.1"
+						"is-extendable": "^0.1.0"
 					}
 				}
 			}
@@ -7857,7 +7876,7 @@
 			"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
 			"dev": true,
 			"requires": {
-				"shebang-regex": "1.0.0"
+				"shebang-regex": "^1.0.0"
 			}
 		},
 		"shebang-regex": {
@@ -7878,9 +7897,9 @@
 			"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "3.2.1",
-				"astral-regex": "1.0.0",
-				"is-fullwidth-code-point": "2.0.0"
+				"ansi-styles": "^3.2.0",
+				"astral-regex": "^1.0.0",
+				"is-fullwidth-code-point": "^2.0.0"
 			}
 		},
 		"snapdragon": {
@@ -7889,14 +7908,14 @@
 			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
 			"dev": true,
 			"requires": {
-				"base": "0.11.2",
-				"debug": "2.6.9",
-				"define-property": "0.2.5",
-				"extend-shallow": "2.0.1",
-				"map-cache": "0.2.2",
-				"source-map": "0.5.7",
-				"source-map-resolve": "0.5.2",
-				"use": "3.1.1"
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
 			},
 			"dependencies": {
 				"debug": {
@@ -7914,7 +7933,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "0.1.6"
+						"is-descriptor": "^0.1.0"
 					}
 				},
 				"extend-shallow": {
@@ -7923,7 +7942,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "0.1.1"
+						"is-extendable": "^0.1.0"
 					}
 				},
 				"ms": {
@@ -7940,9 +7959,9 @@
 			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
 			"dev": true,
 			"requires": {
-				"define-property": "1.0.0",
-				"isobject": "3.0.1",
-				"snapdragon-util": "3.0.1"
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.0",
+				"snapdragon-util": "^3.0.1"
 			},
 			"dependencies": {
 				"define-property": {
@@ -7951,7 +7970,7 @@
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "1.0.2"
+						"is-descriptor": "^1.0.0"
 					}
 				},
 				"is-accessor-descriptor": {
@@ -7960,7 +7979,7 @@
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "6.0.2"
+						"kind-of": "^6.0.0"
 					}
 				},
 				"is-data-descriptor": {
@@ -7969,7 +7988,7 @@
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "6.0.2"
+						"kind-of": "^6.0.0"
 					}
 				},
 				"is-descriptor": {
@@ -7978,9 +7997,9 @@
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "1.0.0",
-						"is-data-descriptor": "1.0.0",
-						"kind-of": "6.0.2"
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
 				}
 			}
@@ -7991,7 +8010,7 @@
 			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
 			"dev": true,
 			"requires": {
-				"kind-of": "3.2.2"
+				"kind-of": "^3.2.0"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -8000,7 +8019,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "1.1.6"
+						"is-buffer": "^1.1.5"
 					}
 				}
 			}
@@ -8017,11 +8036,11 @@
 			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
 			"dev": true,
 			"requires": {
-				"atob": "2.1.2",
-				"decode-uri-component": "0.2.0",
-				"resolve-url": "0.2.1",
-				"source-map-url": "0.4.0",
-				"urix": "0.1.0"
+				"atob": "^2.1.1",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
 			}
 		},
 		"source-map-support": {
@@ -8030,8 +8049,8 @@
 			"integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
 			"dev": true,
 			"requires": {
-				"buffer-from": "1.1.1",
-				"source-map": "0.6.1"
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
 			},
 			"dependencies": {
 				"source-map": {
@@ -8060,8 +8079,8 @@
 			"integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
 			"dev": true,
 			"requires": {
-				"spdx-expression-parse": "3.0.0",
-				"spdx-license-ids": "3.0.4"
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
 			}
 		},
 		"spdx-exceptions": {
@@ -8076,8 +8095,8 @@
 			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
 			"dev": true,
 			"requires": {
-				"spdx-exceptions": "2.2.0",
-				"spdx-license-ids": "3.0.4"
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
 			}
 		},
 		"spdx-license-ids": {
@@ -8092,7 +8111,7 @@
 			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "3.0.2"
+				"extend-shallow": "^3.0.0"
 			}
 		},
 		"sprintf-js": {
@@ -8113,8 +8132,8 @@
 			"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
 			"dev": true,
 			"requires": {
-				"define-property": "0.2.5",
-				"object-copy": "0.1.0"
+				"define-property": "^0.2.5",
+				"object-copy": "^0.1.0"
 			},
 			"dependencies": {
 				"define-property": {
@@ -8123,7 +8142,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "0.1.6"
+						"is-descriptor": "^0.1.0"
 					}
 				}
 			}
@@ -8146,8 +8165,8 @@
 			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
 			"dev": true,
 			"requires": {
-				"is-fullwidth-code-point": "2.0.0",
-				"strip-ansi": "4.0.0"
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^4.0.0"
 			}
 		},
 		"string_decoder": {
@@ -8156,7 +8175,7 @@
 			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "5.1.2"
+				"safe-buffer": "~5.1.0"
 			}
 		},
 		"strip-ansi": {
@@ -8165,7 +8184,7 @@
 			"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "3.0.0"
+				"ansi-regex": "^3.0.0"
 			}
 		},
 		"strip-bom": {
@@ -8174,7 +8193,7 @@
 			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
 			"dev": true,
 			"requires": {
-				"is-utf8": "0.2.1"
+				"is-utf8": "^0.2.0"
 			}
 		},
 		"strip-bom-string": {
@@ -8189,7 +8208,7 @@
 			"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
 			"dev": true,
 			"requires": {
-				"get-stdin": "4.0.1"
+				"get-stdin": "^4.0.1"
 			}
 		},
 		"strip-json-comments": {
@@ -8204,7 +8223,7 @@
 			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 			"dev": true,
 			"requires": {
-				"has-flag": "3.0.0"
+				"has-flag": "^3.0.0"
 			}
 		},
 		"sver-compat": {
@@ -8213,8 +8232,8 @@
 			"integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
 			"dev": true,
 			"requires": {
-				"es6-iterator": "2.0.3",
-				"es6-symbol": "3.1.1"
+				"es6-iterator": "^2.0.1",
+				"es6-symbol": "^3.1.1"
 			}
 		},
 		"table": {
@@ -8223,10 +8242,10 @@
 			"integrity": "sha512-3wUNCgdWX6PNpOe3amTTPWPuF6VGvgzjKCaO1snFj0z7Y3mUPWf5+zDtxUVGispJkDECPmR29wbzh6bVMOHbcw==",
 			"dev": true,
 			"requires": {
-				"ajv": "6.10.0",
-				"lodash": "4.17.11",
-				"slice-ansi": "2.1.0",
-				"string-width": "3.1.0"
+				"ajv": "^6.9.1",
+				"lodash": "^4.17.11",
+				"slice-ansi": "^2.1.0",
+				"string-width": "^3.0.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -8241,9 +8260,9 @@
 					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
 					"dev": true,
 					"requires": {
-						"emoji-regex": "7.0.3",
-						"is-fullwidth-code-point": "2.0.0",
-						"strip-ansi": "5.2.0"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
 				"strip-ansi": {
@@ -8252,7 +8271,7 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "4.1.0"
+						"ansi-regex": "^4.1.0"
 					}
 				}
 			}
@@ -8263,8 +8282,8 @@
 			"integrity": "sha1-C2Rng43Xf79/YqDJPah5cy/9qTI=",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "2.0.3",
-				"tempfile": "0.1.3"
+				"graceful-fs": "~2.0.0",
+				"tempfile": "~0.1.2"
 			},
 			"dependencies": {
 				"graceful-fs": {
@@ -8281,7 +8300,7 @@
 			"integrity": "sha1-fWtxAEcznTn4RzJ6BW2t8YMQMBA=",
 			"dev": true,
 			"requires": {
-				"uuid": "1.4.2"
+				"uuid": "~1.4.0"
 			}
 		},
 		"terser": {
@@ -8290,9 +8309,9 @@
 			"integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
 			"dev": true,
 			"requires": {
-				"commander": "2.20.0",
-				"source-map": "0.6.1",
-				"source-map-support": "0.5.12"
+				"commander": "^2.19.0",
+				"source-map": "~0.6.1",
+				"source-map-support": "~0.5.10"
 			},
 			"dependencies": {
 				"commander": {
@@ -8327,8 +8346,8 @@
 			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
 			"dev": true,
 			"requires": {
-				"readable-stream": "2.3.6",
-				"xtend": "4.0.1"
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
 			}
 		},
 		"through2-filter": {
@@ -8337,8 +8356,8 @@
 			"integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
 			"dev": true,
 			"requires": {
-				"through2": "2.0.5",
-				"xtend": "4.0.1"
+				"through2": "~2.0.0",
+				"xtend": "~4.0.0"
 			}
 		},
 		"time-stamp": {
@@ -8353,8 +8372,8 @@
 			"integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
 			"dev": true,
 			"requires": {
-				"es5-ext": "0.10.50",
-				"next-tick": "1.0.0"
+				"es5-ext": "~0.10.46",
+				"next-tick": "1"
 			}
 		},
 		"tmp": {
@@ -8363,7 +8382,7 @@
 			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
 			"requires": {
-				"os-tmpdir": "1.0.2"
+				"os-tmpdir": "~1.0.2"
 			}
 		},
 		"to-absolute-glob": {
@@ -8372,8 +8391,8 @@
 			"integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
 			"dev": true,
 			"requires": {
-				"is-absolute": "1.0.0",
-				"is-negated-glob": "1.0.0"
+				"is-absolute": "^1.0.0",
+				"is-negated-glob": "^1.0.0"
 			}
 		},
 		"to-object-path": {
@@ -8382,7 +8401,7 @@
 			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
 			"dev": true,
 			"requires": {
-				"kind-of": "3.2.2"
+				"kind-of": "^3.0.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -8391,7 +8410,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "1.1.6"
+						"is-buffer": "^1.1.5"
 					}
 				}
 			}
@@ -8402,10 +8421,10 @@
 			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
 			"dev": true,
 			"requires": {
-				"define-property": "2.0.2",
-				"extend-shallow": "3.0.2",
-				"regex-not": "1.0.2",
-				"safe-regex": "1.1.0"
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
 			}
 		},
 		"to-regex-range": {
@@ -8414,8 +8433,8 @@
 			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 			"dev": true,
 			"requires": {
-				"is-number": "3.0.0",
-				"repeat-string": "1.6.1"
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
 			}
 		},
 		"to-through": {
@@ -8424,7 +8443,7 @@
 			"integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
 			"dev": true,
 			"requires": {
-				"through2": "2.0.5"
+				"through2": "^2.0.3"
 			}
 		},
 		"trim-newlines": {
@@ -8445,7 +8464,7 @@
 			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
 			"dev": true,
 			"requires": {
-				"prelude-ls": "1.1.2"
+				"prelude-ls": "~1.1.2"
 			}
 		},
 		"typedarray": {
@@ -8460,8 +8479,8 @@
 			"integrity": "sha512-KeQesOpPiZNgVwJj8Ge3P4JYbQHUdZzpx6Fahy6eKAYRSV4zhVmLXoC+JtOeYxcHCHTve8RG1ZGdTvpeOUM26Q==",
 			"dev": true,
 			"requires": {
-				"commander": "2.20.0",
-				"source-map": "0.6.1"
+				"commander": "~2.20.0",
+				"source-map": "~0.6.1"
 			},
 			"dependencies": {
 				"commander": {
@@ -8490,15 +8509,15 @@
 			"integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
 			"dev": true,
 			"requires": {
-				"arr-flatten": "1.1.0",
-				"arr-map": "2.0.2",
-				"bach": "1.2.0",
-				"collection-map": "1.0.0",
-				"es6-weak-map": "2.0.2",
-				"last-run": "1.1.1",
-				"object.defaults": "1.1.0",
-				"object.reduce": "1.0.1",
-				"undertaker-registry": "1.0.1"
+				"arr-flatten": "^1.0.1",
+				"arr-map": "^2.0.0",
+				"bach": "^1.0.0",
+				"collection-map": "^1.0.0",
+				"es6-weak-map": "^2.0.1",
+				"last-run": "^1.1.0",
+				"object.defaults": "^1.0.0",
+				"object.reduce": "^1.0.0",
+				"undertaker-registry": "^1.0.0"
 			}
 		},
 		"undertaker-registry": {
@@ -8513,10 +8532,10 @@
 			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
 			"dev": true,
 			"requires": {
-				"arr-union": "3.1.0",
-				"get-value": "2.0.6",
-				"is-extendable": "0.1.1",
-				"set-value": "0.4.3"
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^0.4.3"
 			},
 			"dependencies": {
 				"extend-shallow": {
@@ -8525,7 +8544,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "0.1.1"
+						"is-extendable": "^0.1.0"
 					}
 				},
 				"set-value": {
@@ -8534,10 +8553,10 @@
 					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
 					"dev": true,
 					"requires": {
-						"extend-shallow": "2.0.1",
-						"is-extendable": "0.1.1",
-						"is-plain-object": "2.0.4",
-						"to-object-path": "0.3.0"
+						"extend-shallow": "^2.0.1",
+						"is-extendable": "^0.1.1",
+						"is-plain-object": "^2.0.1",
+						"to-object-path": "^0.3.0"
 					}
 				}
 			}
@@ -8548,8 +8567,8 @@
 			"integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
 			"dev": true,
 			"requires": {
-				"json-stable-stringify-without-jsonify": "1.0.1",
-				"through2-filter": "3.0.0"
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"through2-filter": "^3.0.0"
 			}
 		},
 		"unset-value": {
@@ -8558,8 +8577,8 @@
 			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
 			"dev": true,
 			"requires": {
-				"has-value": "0.3.1",
-				"isobject": "3.0.1"
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
 			},
 			"dependencies": {
 				"has-value": {
@@ -8568,9 +8587,9 @@
 					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
 					"dev": true,
 					"requires": {
-						"get-value": "2.0.6",
-						"has-values": "0.1.4",
-						"isobject": "2.1.0"
+						"get-value": "^2.0.3",
+						"has-values": "^0.1.4",
+						"isobject": "^2.0.0"
 					},
 					"dependencies": {
 						"isobject": {
@@ -8604,7 +8623,7 @@
 			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
 			"dev": true,
 			"requires": {
-				"punycode": "2.1.1"
+				"punycode": "^2.1.0"
 			}
 		},
 		"urix": {
@@ -8637,7 +8656,7 @@
 			"integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
 			"dev": true,
 			"requires": {
-				"homedir-polyfill": "1.0.3"
+				"homedir-polyfill": "^1.0.1"
 			}
 		},
 		"validate-npm-package-license": {
@@ -8646,8 +8665,8 @@
 			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
 			"dev": true,
 			"requires": {
-				"spdx-correct": "3.1.0",
-				"spdx-expression-parse": "3.0.0"
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
 			}
 		},
 		"value-or-function": {
@@ -8662,12 +8681,12 @@
 			"integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
 			"dev": true,
 			"requires": {
-				"clone": "2.1.2",
-				"clone-buffer": "1.0.0",
-				"clone-stats": "1.0.0",
-				"cloneable-readable": "1.1.2",
-				"remove-trailing-separator": "1.1.0",
-				"replace-ext": "1.0.0"
+				"clone": "^2.1.1",
+				"clone-buffer": "^1.0.0",
+				"clone-stats": "^1.0.0",
+				"cloneable-readable": "^1.0.0",
+				"remove-trailing-separator": "^1.0.1",
+				"replace-ext": "^1.0.0"
 			}
 		},
 		"vinyl-fs": {
@@ -8676,23 +8695,23 @@
 			"integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
 			"dev": true,
 			"requires": {
-				"fs-mkdirp-stream": "1.0.0",
-				"glob-stream": "6.1.0",
-				"graceful-fs": "4.1.15",
-				"is-valid-glob": "1.0.0",
-				"lazystream": "1.0.0",
-				"lead": "1.0.0",
-				"object.assign": "4.1.0",
-				"pumpify": "1.5.1",
-				"readable-stream": "2.3.6",
-				"remove-bom-buffer": "3.0.0",
-				"remove-bom-stream": "1.2.0",
-				"resolve-options": "1.1.0",
-				"through2": "2.0.5",
-				"to-through": "2.0.0",
-				"value-or-function": "3.0.0",
-				"vinyl": "2.2.0",
-				"vinyl-sourcemap": "1.1.0"
+				"fs-mkdirp-stream": "^1.0.0",
+				"glob-stream": "^6.1.0",
+				"graceful-fs": "^4.0.0",
+				"is-valid-glob": "^1.0.0",
+				"lazystream": "^1.0.0",
+				"lead": "^1.0.0",
+				"object.assign": "^4.0.4",
+				"pumpify": "^1.3.5",
+				"readable-stream": "^2.3.3",
+				"remove-bom-buffer": "^3.0.0",
+				"remove-bom-stream": "^1.2.0",
+				"resolve-options": "^1.1.0",
+				"through2": "^2.0.0",
+				"to-through": "^2.0.0",
+				"value-or-function": "^3.0.0",
+				"vinyl": "^2.0.0",
+				"vinyl-sourcemap": "^1.1.0"
 			}
 		},
 		"vinyl-sourcemap": {
@@ -8701,13 +8720,13 @@
 			"integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
 			"dev": true,
 			"requires": {
-				"append-buffer": "1.0.2",
-				"convert-source-map": "1.6.0",
-				"graceful-fs": "4.1.15",
-				"normalize-path": "2.1.1",
-				"now-and-later": "2.0.1",
-				"remove-bom-buffer": "3.0.0",
-				"vinyl": "2.2.0"
+				"append-buffer": "^1.0.2",
+				"convert-source-map": "^1.5.0",
+				"graceful-fs": "^4.1.6",
+				"normalize-path": "^2.1.1",
+				"now-and-later": "^2.0.0",
+				"remove-bom-buffer": "^3.0.0",
+				"vinyl": "^2.0.0"
 			}
 		},
 		"vinyl-sourcemaps-apply": {
@@ -8716,7 +8735,7 @@
 			"integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
 			"dev": true,
 			"requires": {
-				"source-map": "0.5.7"
+				"source-map": "^0.5.1"
 			}
 		},
 		"which": {
@@ -8725,7 +8744,7 @@
 			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
 			"dev": true,
 			"requires": {
-				"isexe": "2.0.0"
+				"isexe": "^2.0.0"
 			}
 		},
 		"which-module": {
@@ -8746,8 +8765,8 @@
 			"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
 			"dev": true,
 			"requires": {
-				"string-width": "1.0.2",
-				"strip-ansi": "3.0.1"
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -8762,7 +8781,7 @@
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"requires": {
-						"number-is-nan": "1.0.1"
+						"number-is-nan": "^1.0.0"
 					}
 				},
 				"string-width": {
@@ -8771,9 +8790,9 @@
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"dev": true,
 					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
 					}
 				},
 				"strip-ansi": {
@@ -8782,7 +8801,7 @@
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "2.1.1"
+						"ansi-regex": "^2.0.0"
 					}
 				}
 			}
@@ -8799,7 +8818,7 @@
 			"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
 			"dev": true,
 			"requires": {
-				"mkdirp": "0.5.1"
+				"mkdirp": "^0.5.1"
 			}
 		},
 		"xtend": {
@@ -8820,19 +8839,19 @@
 			"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
 			"dev": true,
 			"requires": {
-				"camelcase": "3.0.0",
-				"cliui": "3.2.0",
-				"decamelize": "1.2.0",
-				"get-caller-file": "1.0.3",
-				"os-locale": "1.4.0",
-				"read-pkg-up": "1.0.1",
-				"require-directory": "2.1.1",
-				"require-main-filename": "1.0.1",
-				"set-blocking": "2.0.0",
-				"string-width": "1.0.2",
-				"which-module": "1.0.0",
-				"y18n": "3.2.1",
-				"yargs-parser": "5.0.0"
+				"camelcase": "^3.0.0",
+				"cliui": "^3.2.0",
+				"decamelize": "^1.1.1",
+				"get-caller-file": "^1.0.1",
+				"os-locale": "^1.4.0",
+				"read-pkg-up": "^1.0.1",
+				"require-directory": "^2.1.1",
+				"require-main-filename": "^1.0.1",
+				"set-blocking": "^2.0.0",
+				"string-width": "^1.0.2",
+				"which-module": "^1.0.0",
+				"y18n": "^3.2.1",
+				"yargs-parser": "^5.0.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -8847,7 +8866,7 @@
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"requires": {
-						"number-is-nan": "1.0.1"
+						"number-is-nan": "^1.0.0"
 					}
 				},
 				"string-width": {
@@ -8856,9 +8875,9 @@
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"dev": true,
 					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
 					}
 				},
 				"strip-ansi": {
@@ -8867,7 +8886,7 @@
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "2.1.1"
+						"ansi-regex": "^2.0.0"
 					}
 				}
 			}
@@ -8878,7 +8897,7 @@
 			"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
 			"dev": true,
 			"requires": {
-				"camelcase": "3.0.0"
+				"camelcase": "^3.0.0"
 			}
 		}
 	}

From bdc076b6644e99441d5cf3040a3f6370a73e3b4d Mon Sep 17 00:00:00 2001
From: argoneus <argoneus@poweris.moe>
Date: Fri, 31 Jul 2020 10:53:46 +0200
Subject: [PATCH 5/7] fixed player supporting global

---
 Js/Main.js       | 4 ++--
 Js/Translations  | 2 +-
 Js/UtageParse.js | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Js/Main.js b/Js/Main.js
index ccf8202..9c491ee 100644
--- a/Js/Main.js
+++ b/Js/Main.js
@@ -142,7 +142,7 @@ function buildQuestSelectList() {
 			let tl_key = utage.questTranslations[cust][q.QuestMstId];
 			if (!tl_key) {
 				console.log("Failed to build quest list: missing translations");
-				return;
+				continue;
 			}
 			if (!tl_key.Enabled && !utage.quests[cust][q.QuestMstId].Scenes.some((s) => { return utage.sceneTranslations[cust][s].Enabled === true })) {
 				continue;
@@ -191,7 +191,7 @@ function buildSceneSelectList() {
 			let tl_key = utage.sceneTranslations[cust][questSceneMstId];
 			if (!tl_key) {
 				console.log("Failed to build scene list: missing translations");
-				return;
+				continue;
 			}
 			if (!tl_key.Enabled) {
 				continue;
diff --git a/Js/Translations b/Js/Translations
index 178ec9b..ac0bfbd 160000
--- a/Js/Translations
+++ b/Js/Translations
@@ -1 +1 @@
-Subproject commit 178ec9be36f504418d6aae0bb099d5006bd4186a
+Subproject commit ac0bfbd699431e9befdd843379e7c91ad1014cec
diff --git a/Js/UtageParse.js b/Js/UtageParse.js
index 3efa61e..69387e7 100644
--- a/Js/UtageParse.js
+++ b/Js/UtageParse.js
@@ -141,7 +141,9 @@ class UtageInfo {
 					for (const k of Object.keys(this.questTranslationsInner[this.currentTranslation][c])) {
 						if (this.questTranslationsInner[this.currentTranslation][c][k].Enabled) {
 							for (const s of this.quests[c][k].Scenes) {
-								this.sceneTranslationsInner[this.currentTranslation][c][s].Enabled = true;
+								if (c in this.sceneTranslationsInner[this.currentTranslation] && s in this.sceneTranslationsInner[this.currentTranslation][c]) {
+									this.sceneTranslationsInner[this.currentTranslation][c][s].Enabled = true;
+								}
 							}
 						}
 					}

From afd850fbcaa64f8a38f69a338a98645e79bb6940 Mon Sep 17 00:00:00 2001
From: louis <louis@poweris.moe>
Date: Fri, 31 Jul 2020 10:32:42 -0400
Subject: [PATCH 6/7] make sure translation is supplied when propagating
 enables

---
 Js/UtageParse.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Js/UtageParse.js b/Js/UtageParse.js
index 69387e7..a33cde2 100644
--- a/Js/UtageParse.js
+++ b/Js/UtageParse.js
@@ -141,7 +141,10 @@ class UtageInfo {
 					for (const k of Object.keys(this.questTranslationsInner[this.currentTranslation][c])) {
 						if (this.questTranslationsInner[this.currentTranslation][c][k].Enabled) {
 							for (const s of this.quests[c][k].Scenes) {
-								if (c in this.sceneTranslationsInner[this.currentTranslation] && s in this.sceneTranslationsInner[this.currentTranslation][c]) {
+								// only propagate if exists in translation file (THANKS GLOBAL) and translated name is supplied
+								if (c in this.sceneTranslationsInner[this.currentTranslation]
+								    && s in this.sceneTranslationsInner[this.currentTranslation][c]
+								    && this.sceneTranslationsInner[this.currentTranslation][c][s].Name != "") {
 									this.sceneTranslationsInner[this.currentTranslation][c][s].Enabled = true;
 								}
 							}

From d6ac86ed8ca5e914dace44cb5760038d41f94b2a Mon Sep 17 00:00:00 2001
From: louis <louis@poweris.moe>
Date: Tue, 11 Aug 2020 11:52:45 -0400
Subject: [PATCH 7/7] load name variants

global stinx
---
 CHANGELOG.md |  6 +++++-
 Js/Main.js   |  2 +-
 Js/Player.js | 21 ++++++++++++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f696757..d5b8181 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,4 +43,8 @@ Fix MoveCamera macro
 
 ## V1.4.0 (2019-09-29)
 
-Updated Pixi.js to v5
\ No newline at end of file
+Updated Pixi.js to v5
+
+## V1.5.0 (2020-07-31)
+
+XDU Global support
diff --git a/Js/Main.js b/Js/Main.js
index 9c491ee..0a8804e 100644
--- a/Js/Main.js
+++ b/Js/Main.js
@@ -11,7 +11,7 @@ const textFunc = new TextFunctions();
 let audio = undefined; //Cant create a audio context without user input.
 const player = new Player(pixiApp, utage, textFunc, audio, shaders);
 const languages = ["eng", "jpn", "rus", "enm", "kor", "zho"];
-const version = "YameteTomete XDUPlayer V1.4.0";
+const version = "YameteTomete XDUPlayer V1.5.0";
 let bodyLoaded = false;
 let utageLoaded = false;
 let languagesLoaded = false;
diff --git a/Js/Player.js b/Js/Player.js
index 99ab45e..5f9d29b 100644
--- a/Js/Player.js
+++ b/Js/Player.js
@@ -960,7 +960,12 @@ class Player {
 			let text = cur.English ? (this.utage.translations ? (this.utage.translations[cur.English] || cur.Text) : cur.Text) : cur.Text;
 			text = commonFunctions.convertUtageTextTags(text);
 			if(cur.Arg2 && cur.Arg2.toLowerCase() === "<off>") {
-				this.text.characterName(true, this.utage.charTranslations[cur.Arg1] || cur.Arg1);
+				let nameFullWidth = cur.Arg1.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) + 0xFEE0);});
+				let nameHalfWidth = cur.Arg1.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) - 0xFEE0)});
+				this.text.characterName(true, this.utage.charTranslations[cur.Arg1]
+					|| this.utage.charTranslations[nameFullWidth]
+					|| this.utage.charTranslations[nameHalfWidth]
+					|| cur.Arg1);
 				this.text.dialogText(true, commonFunctions.convertUtageTextTags(text));
 			} else {
 				let found = false;
@@ -975,7 +980,12 @@ class Player {
 						if(cur.Character) {
 							nameToUse = cur.Arg1;
 						}
-						this.text.characterName(true, this.utage.charTranslations[nameToUse] || nameToUse);
+						let nameFullWidth = nameToUse.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) + 0xFEE0);});
+						let nameHalfWidth = nameToUse.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) - 0xFEE0)});
+						this.text.characterName(true, this.utage.charTranslations[nameToUse]
+							|| this.utage.charTranslations[nameFullWidth]
+							|| this.utage.charTranslations[nameHalfWidth]
+							|| nameToUse);
 						this.text.dialogText(true, text);
 						//restoreTint is set from a colorTo command.
 						//We want to maintain the tint change from colorTo during speaking still.
@@ -1013,7 +1023,12 @@ class Player {
 				}
 				//If we didnt find the character just dump the text anyways with Arg1 as the name
 				if(!found) {
-					this.text.characterName(true, this.utage.charTranslations[cur.Arg1] || cur.Arg1);
+					let nameFullWidth = cur.Arg1.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) + 0xFEE0);});
+					let nameHalfWidth = cur.Arg1.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) - 0xFEE0)});
+					this.text.characterName(true, this.utage.charTranslations[cur.Arg1]
+						|| this.utage.charTranslations[nameFullWidth]
+						|| this.utage.charTranslations[nameHalfWidth]
+						|| cur.Arg1);
 					this.text.dialogText(true, text);
 				}
 			}