WIP - new tutorial step

2016-12-20 11:33:17 -08:00 · 2016-12-20 11:33:17 -08:00 · 45ddb00c42
commit 45ddb00c42
parent c45e01abd1
18 changed files with 253 additions and 163 deletions
--- a/mobile/app/pods/components/hue-controls/component.js
+++ b/mobile/app/pods/components/hue-controls/component.js
@ -143,11 +143,14 @@ export default Component.extend({
      location.reload();
    },
    startIntro(){
-      let INTRO = introJs,
-        intro = INTRO(),
+      let intro = introJs(),
        playerBottom = $('#player-bottom'),
        beatDetectionAreaArrowIcon = $('#beat-detection-area-arrow-icon');

+      if(this.get('dimmerOn')) {
+        this.send('toggleDimmer');
+      }
+
      intro.setOptions({
        steps: [
          {
@ -163,6 +166,11 @@ export default Component.extend({
            intro: 'You can add and select music to play from your playlist here. You may listen to local audio files, stream music from soundcloud or stream directly from a connected microphone.<br><br>' +
            '<i><b>TIP</b>: Songs added through Soundcloud will be saved for when you visit this page again.</i>'
          },
+          {
+            element: $('#playlist md-menu')[0],
+            intro: '<img src="/assets/images/soundcloudUrl.png" id="soundcloud-tutorial">You can add songs from SoundCloud by copy and pasting the URL shown here',
+            position: 'left'
+          },
          {
            element: '#player-area',
            intro: 'The audio playback may be controlled with the controls here. Basic music visualization effects may be shown here by selecting them from the menu ( eyeball icon in the bottom right ).'
@ -211,7 +219,7 @@ export default Component.extend({

      // it's VERY ugly but it works... the jQuery massacre :'(
      intro.onchange((element) => {
-        if(element.id === '' || element.id === 'music-tab' || element.id === 'playlist' || element.id === 'player-area' || element.id === 'beat-option-row' || element.id === 'beat-option-button-group' || element.id === 'beat-container' || element.id === 'using-mic-audio-tooltip'){
+        if(element.id === '' || element.id === 'music-tab' || element.id === 'playlist' || element.id === 'player-area' || element.id === 'beat-option-row' || element.id === 'beat-option-button-group' || element.id === 'beat-container' || element.id === 'using-mic-audio-tooltip' || element.nodeName === 'MD-MENU'){
          $('.navigation-item').eq(1).click();
        } else {
          $('.navigation-item').eq(0).click();
--- a/mobile/app/pods/components/music-tab/component.js
+++ b/mobile/app/pods/components/music-tab/component.js
@ -501,7 +501,6 @@ export default Component.extend(helperMixin, visualizerMixin, {
        }

        if(scrollToSong){
-          // this is just a bad workaround to make sure that the track has been rendered to the playlist
          run.next(this, ()=>{
            $('.track'+index).velocity('scroll', { container: $('#play-list-area'), duration: 200 });
          });
--- a/mobile/app/styles/introjs.scss
+++ b/mobile/app/styles/introjs.scss
@ -8,6 +8,7 @@

 .introjs-tooltip {
  color: $blackish;
+  width: 300px;
 }

 .introjs-skipbutton {
--- a/mobile/app/styles/music-tab.scss
+++ b/mobile/app/styles/music-tab.scss
@ -255,7 +255,6 @@
  border: 1px solid black;
  width: 100%;
  background: white;
-  padding-bottom: 20px;
  border-bottom-left-radius: 5px;
  border-bottom-right-radius: 5px;
  .md-label {
@ -357,3 +356,7 @@
  top: 0;
  bottom: initial;
 }
+
+#soundcloud-tutorial {
+  width: 100%;
+}
--- a/mobile/ember-cordova/cordova/config.xml
+++ b/mobile/ember-cordova/cordova/config.xml
@ -18,6 +18,7 @@
    <allow-intent href="sms:*" />
    <allow-intent href="mailto:*" />
    <allow-intent href="geo:*" />
+    <allow-navigation href="*" />
    <platform name="windows">
        <icon src="res/icon/windows/StoreLogo.png" target="StoreLogo" />
        <icon src="res/icon/windows/smalllogo.png" target="Square30x30Logo" />
--- a/mobile/package.json
+++ b/mobile/package.json
@ -1,6 +1,6 @@
 {
  "name": "huegasm_mobile",
-  "version": "1.0.0",
+  "version": "1.1.0",
  "description": "Huegasm is a free web application for managing and synchronizing your Philips Hue lights with the beat of your music.",
  "private": true,
  "directories": {
@ -10,6 +10,7 @@
  "scripts": {
    "start": "ember server",
    "build": "ember cordova:build --platform=android --environment=production --release",
+    "build-test": "ember cordova:build --platform=android",
    "test": "ember test",
    "cordova": "ember cdv:serve --platform=android"
  },
@ -28,7 +29,7 @@
    "ember-cli-htmlbars": "^1.0.1",
    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
    "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-nouislider": "^0.10.0",
+    "ember-cli-nouislider": "^0.11.0",
    "ember-cli-qunit": "^1.2.1",
    "ember-cli-release": "0.2.8",
    "ember-cli-sass": "^5.2.1",
@ -37,9 +38,9 @@
    "ember-cli-uglify": "^1.2.0",
    "ember-cordova": "^0.3.5",
    "ember-cordova-events": "^0.1.0",
-    "ember-cordova-keyboard": "^0.0.1",
+    "ember-cordova-keyboard": "^0.0.2",
    "ember-export-application-global": "^1.0.4",
-    "ember-load-initializers": "^0.5.0",
+    "ember-load-initializers": "^0.6.3",
    "ember-modal-dialog": "^0.9.0",
    "ember-notify": "^5.0.4",
    "ember-paper": "^1.0.0-alpha.11",
--- a/mobile/public/assets/images/soundcloudUrl.png
+++ b/mobile/public/assets/images/soundcloudUrl.png
--- a/mobile/yarn.lock
+++ b/mobile/yarn.lock
@ -3,8 +3,8 @@


 JSONStream@^1.0.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.2.1.tgz#32aa5790e799481083b49b4b7fa94e23bae69bf9"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.0.tgz#680ab9ac6572a8a1a207e0b38721db1c77b215e5"
  dependencies:
    jsonparse "^1.2.0"
    through ">=2.2.7 <3"
@ -242,6 +242,10 @@ ast-types@0.8.12:
  version "0.8.12"
  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"

+ast-types@0.8.15:
+  version "0.8.15"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52"
+
 ast-types@0.9.2:
  version "0.9.2"
  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.2.tgz#2cc19979d15c655108bf565323b8e7ee38751f6b"
@ -1185,12 +1189,12 @@ can-symlink@^1.0.0:
    tmp "0.0.28"

 caniuse-db@^1.0.30000153, caniuse-db@^1.0.30000214:
-  version "1.0.30000597"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000597.tgz#b52e6cbe9dc83669affb98501629feaee1af6588"
+  version "1.0.30000600"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000600.tgz#2d0892f77eebb399c3c17b3ecb72da7b8740f31f"

 capture-exit@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.0.7.tgz#69b4023241347a9b3db9f13eb91d22765e9a86f8"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.1.0.tgz#d931b32b11c2bd20ae57f34af0c1eb2c18781626"
  dependencies:
    rsvp "^3.3.3"

@ -1288,8 +1292,8 @@ clean-css-promise@^0.1.0:
    pinkie-promise "^2.0.0"

 clean-css@^3.4.5:
-  version "3.4.22"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.22.tgz#db323064f752028778233b58c54cd8535f860892"
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.23.tgz#604fbbca24c12feb59b02f00b84f1fb7ded6d001"
  dependencies:
    commander "2.8.x"
    source-map "0.4.x"
@ -1483,7 +1487,7 @@ concat-map@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"

-concat-stream@1.5.0:
+concat-stream@1.5.0, concat-stream@^1.4.7:
  version "1.5.0"
  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611"
  dependencies:
@ -1491,7 +1495,7 @@ concat-stream@1.5.0:
    readable-stream "~2.0.0"
    typedarray "~0.0.5"

-concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2, concat-stream@~1.5.0, concat-stream@~1.5.1:
+concat-stream@^1.4.6, concat-stream@^1.5.2, concat-stream@~1.5.0, concat-stream@~1.5.1:
  version "1.5.2"
  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
  dependencies:
@ -1798,8 +1802,8 @@ debug@2.2.0, debug@~2.2.0:
    ms "0.7.1"

 debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.4.5.tgz#34c7b12a1ca96674428f41fe92c49b4ce7cd0607"
  dependencies:
    ms "0.7.2"

@ -2041,7 +2045,7 @@ ember-cli-babel@5.1.10:
    ember-cli-version-checker "^1.0.2"
    resolve "^1.1.2"

-ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6:
+ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.1.tgz#14a1a7b3ae9e9f1284f7bcdb142eb53bd0b1b5bd"
  dependencies:
@ -2103,7 +2107,7 @@ ember-cli-htmlbars-inline-precompile@^0.3.1:
    ember-cli-htmlbars "^1.0.0"
    hash-for-dep "^1.0.2"

-ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.0:
+ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.1.1.tgz#8776cf59796dac8f32e8625fc6d1ea45ffa55de1"
  dependencies:
@ -2153,12 +2157,12 @@ ember-cli-normalize-entity-name@^1.0.0:
  dependencies:
    silent-error "^1.0.0"

-ember-cli-nouislider@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-nouislider/-/ember-cli-nouislider-0.10.0.tgz#94bda98cc3d8809cbceb41cdf151b715528e5570"
+ember-cli-nouislider@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-nouislider/-/ember-cli-nouislider-0.11.0.tgz#645cf05be1e977376f2567b5b6ac845fe7c71314"
  dependencies:
-    ember-cli-babel "^5.1.6"
-    ember-cli-htmlbars "^1.0.3"
+    ember-cli-babel "^5.1.7"
+    ember-cli-htmlbars "^1.0.10"

 ember-cli-path-utils@^1.0.0:
  version "1.0.0"
@ -2261,7 +2265,7 @@ ember-cli-valid-component-name@^1.0.0:
  dependencies:
    silent-error "^1.0.0"

-ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7:
+ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.2.0.tgz#caa286b77d1b485df5d2f62c67a6f19aa8b582c4"
  dependencies:
@ -2440,16 +2444,22 @@ ember-composability-tools@0.0.5:
    ember-wormhole "0.4.1"

 ember-concurrency@^0.7.9:
-  version "0.7.15"
-  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.15.tgz#a35577e20220e9ddc93b0b801dbb9fd7554aca49"
+  version "0.7.17"
+  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.17.tgz#28f963c96fa5d1c42bb4b239c0212220d849738f"
  dependencies:
    ember-cli-babel "^5.1.5"
-    ember-getowner-polyfill "1.0.1"
+    ember-getowner-polyfill "^1.1.0"
    ember-maybe-import-regenerator "^0.1.4"

-ember-cordova-keyboard@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/ember-cordova-keyboard/-/ember-cordova-keyboard-0.0.1.tgz#45bc12b1ec90ef0f095d14bcdf78156ce40b3a34"
+ember-cordova-events@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cordova-events/-/ember-cordova-events-0.1.0.tgz#7217b830478f6e87bf809530d84a6046b03f662c"
+  dependencies:
+    ember-cli-babel "^5.1.6"
+
+ember-cordova-keyboard@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cordova-keyboard/-/ember-cordova-keyboard-0.0.2.tgz#b2128e3f40a285c7ba54d32d46427c202a6f3bbf"
  dependencies:
    chalk "^1.1.1"
    ember-cli-babel "^5.1.5"
@ -2479,9 +2489,9 @@ ember-cordova@^0.3.5:
    uuid "^3.0.0"
    xml2js "^0.4.17"

-ember-css-transitions@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.7.tgz#ceac6c5d09744fac7e6aee5b6a9e1d107bc50a7e"
+ember-css-transitions@0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.8.tgz#2c9454b4cc1db367849a4f8a7e8c4b082bb97d19"
  dependencies:
    ember-cli-babel "^5.1.6"

@ -2491,15 +2501,18 @@ ember-export-application-global@^1.0.4:
  dependencies:
    ember-cli-babel "^5.1.10"

-ember-getowner-polyfill@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.0.1.tgz#f60a31d25d642461dac4b4746184afaf7f5084ae"
+ember-getowner-polyfill@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.1.1.tgz#6bb6603827dd2f8f33be2434570a86cc9e5273ff"
  dependencies:
-    ember-cli-babel "^5.1.5"
+    ember-cli-babel "^5.1.6"
+    ember-cli-version-checker "^1.2.0"

-ember-load-initializers@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-0.5.1.tgz#76e3db23c111dbdcd3ae6f687036bf0b56be0cbe"
+ember-load-initializers@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-0.6.3.tgz#f47396ad271ba77294068c98f992a5f19705441a"
+  dependencies:
+    ember-cli-babel "^5.1.6"

 ember-maybe-import-regenerator@^0.1.4:
  version "0.1.4"
@ -2528,9 +2541,9 @@ ember-notify@^5.0.4:
    ember-string-ishtmlsafe-polyfill "1.0.1"
    object-assign "^4.1.0"

-ember-paper@^1.0.0-alpha.7:
-  version "1.0.0-alpha.11"
-  resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.11.tgz#200a729a8bb9e1cc0fe2788785e5b404d18fd291"
+ember-paper@^1.0.0-alpha.11:
+  version "1.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.12.tgz#9d686e5a05afd89f3143c0e72153d9c7f02b5b2a"
  dependencies:
    angular-material-source angular/material#v1.0.6
    broccoli-autoprefixer "^3.0.0"
@ -2538,9 +2551,9 @@ ember-paper@^1.0.0-alpha.7:
    broccoli-funnel "^1.0.1"
    broccoli-merge-trees "^1.1.0"
    ember-basic-dropdown "^0.16.0"
-    ember-cli-babel "^5.1.6"
+    ember-cli-babel "^5.1.7"
    ember-composability-tools "0.0.5"
-    ember-css-transitions "0.1.7"
+    ember-css-transitions "0.1.8"
    ember-power-select "1.0.0-beta.23"
    ember-wormhole "0.4.1"
    resolve "^1.1.7"
@ -3089,7 +3102,7 @@ fresh@0.3.0:

 fs-exists-sync@^0.1.0:
  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  resolved "http://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"

 fs-extra@0.30.0, fs-extra@^0.30.0:
  version "0.30.0"
@ -3144,8 +3157,8 @@ fs-tree-diff@^0.4.4:
    fast-ordered-set "^1.0.2"

 fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.5.tgz#7825b4db454225dd114e7abd58e8926fe068cbff"
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.6.tgz#342665749e8dca406800b672268c8f5073f3e623"
  dependencies:
    heimdalljs-logger "^0.1.7"
    object-assign "^4.1.0"
@ -3218,6 +3231,20 @@ gauge@~1.2.5:
    lodash.padend "^4.1.0"
    lodash.padstart "^4.1.0"

+gauge@~2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.6.0.tgz#d35301ad18e96902b4751dcbbe40f4218b942a46"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-color "^0.1.7"
+    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"
+
 gauge@~2.7.1:
  version "2.7.2"
  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.2.tgz#15cecc31b02d05345a5d6b0e171cdb3ad2307774"
@ -3262,11 +3289,7 @@ getpass@^0.1.1:
  dependencies:
    assert-plus "^1.0.0"

-git-repo-info@^1.0.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.3.1.tgz#0c1a19ef1964b822a7230f087396af80481ce8ec"
-
-git-repo-info@~1.2.0:
+git-repo-info@^1.0.4, git-repo-info@~1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.2.0.tgz#43d8513e04a24dd441330a2f7c6655a709fdbaf2"

@ -3447,7 +3470,7 @@ has-binary@0.1.7:
  dependencies:
    isarray "0.0.1"

-has-color@~0.1.0:
+has-color@^0.1.7, has-color@~0.1.0:
  version "0.1.7"
  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"

@ -3466,10 +3489,11 @@ has@^1.0.0:
    function-bind "^1.0.2"

 hash-for-dep@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.0.3.tgz#b57f18a0ace56380951638a3b36a6b73d8619b8b"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.0.4.tgz#8774e7b80c7c07be3bdc58b55278a4c6865d3737"
  dependencies:
    broccoli-kitchen-sink-helpers "^0.3.1"
+    heimdalljs "^0.2.3"
    resolve "^1.1.6"

 hash.js@^1.0.0:
@ -3516,7 +3540,7 @@ heimdalljs-logger@^0.1.7:
    debug "^2.2.0"
    heimdalljs "^0.2.0"

-heimdalljs@^0.2.0, heimdalljs@^0.2.1:
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3:
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.3.tgz#35b82a6a4d73541fc4fb88d2fe2b23608fb4f779"
  dependencies:
@ -5060,7 +5084,7 @@ npm@3.10.8:
    wrappy "~1.0.2"
    write-file-atomic "~1.2.0"

-"npmlog@0 || 1 || 2", "npmlog@0 || 1 || 2 || 3", "npmlog@0.1 || 1 || 2", "npmlog@~2.0.0 || ~3.1.0", npmlog@~2.0.3:
+"npmlog@0 || 1 || 2", "npmlog@0.1 || 1 || 2", npmlog@~2.0.3:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692"
  dependencies:
@ -5068,6 +5092,15 @@ npm@3.10.8:
    are-we-there-yet "~1.1.2"
    gauge "~1.2.5"

+"npmlog@0 || 1 || 2 || 3", "npmlog@~2.0.0 || ~3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-3.1.2.tgz#2d46fa874337af9498a2f12bb43d8d0be4a36873"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.6.0"
+    set-blocking "~2.0.0"
+
 npmlog@^4.0.0, npmlog@~4.0.0:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
@ -5474,10 +5507,14 @@ qs@5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.0.tgz#a9f31142af468cb72b25b30136ba2456834916be"

-qs@6.2.0, qs@^6.2.0, qs@~6.2.0:
+qs@6.2.0, qs@~6.2.0:
  version "6.2.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"

+qs@^6.2.0, qs@~6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
+
 qs@~2.3.1:
  version "2.3.3"
  resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
@ -5490,10 +5527,6 @@ qs@~6.1.0:
  version "6.1.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.1.0.tgz#ec1d1626b24278d99f0fdf4549e524e24eceeb26"

-qs@~6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
-
 querystring-es3@~0.2.0:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@ -5618,9 +5651,9 @@ read@1, read@~1.0.1, read@~1.0.7:
  dependencies:
    mute-stream "~0.0.4"

-"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@~2.1.2, readable-stream@~2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
+"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.1.5:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
  dependencies:
    buffer-shims "^1.0.0"
    core-util-is "~1.0.0"
@ -5659,6 +5692,18 @@ readable-stream@~2.0.0, readable-stream@~2.0.5:
    string_decoder "~0.10.x"
    util-deprecate "~1.0.1"

+readable-stream@~2.1.2, readable-stream@~2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
+  dependencies:
+    buffer-shims "^1.0.0"
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
 readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
@ -5683,7 +5728,7 @@ realize-package-specifier@~3.0.3:
    dezalgo "^1.0.1"
    npm-package-arg "^4.1.1"

-recast@0.10.33, recast@^0.10.10:
+recast@0.10.33:
  version "0.10.33"
  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
  dependencies:
@ -5692,6 +5737,15 @@ recast@0.10.33, recast@^0.10.10:
    private "~0.1.5"
    source-map "~0.5.0"

+recast@^0.10.10:
+  version "0.10.43"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f"
+  dependencies:
+    ast-types "0.8.15"
+    esprima-fb "~15001.1001.0-dev-harmony-fb"
+    private "~0.1.5"
+    source-map "~0.5.0"
+
 recast@^0.11.17, recast@^0.11.3:
  version "0.11.18"
  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.18.tgz#07af6257ca769868815209401d4d60eef1b5b947"
@ -6715,7 +6769,7 @@ umask@~1.1.0:

 umd@^3.0.0:
  version "3.0.1"
-  resolved "http://registry.npmjs.org/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
+  resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"

 underscore.string@~2.3.3:
  version "2.3.3"
--- a/web/app/pods/components/hue-controls/component.js
+++ b/web/app/pods/components/hue-controls/component.js
@ -127,10 +127,13 @@ export default Component.extend({
      location.reload();
    },
    startIntro(){
-      let INTRO = introJs,
-        intro = INTRO(),
+      let intro = introJs(),
        playerBottom = $('#player-bottom');

+      if(this.get('dimmerOn')) {
+        this.send('toggleDimmer');
+      }
+
      intro.setOptions({
        steps: [
          {
@ -146,6 +149,11 @@ export default Component.extend({
            intro: 'You can add and select music to play from your playlist here. You may listen to local audio files, stream music from soundcloud or stream directly from a connected microphone.<br><br>' +
            '<i><b>TIP</b>: Songs added through Soundcloud will be saved for when you visit this page again.</i>'
          },
+          {
+            element: $('#playlist md-menu')[0],
+            intro: '<img src="/assets/images/soundcloudUrl.png" id="soundcloud-tutorial">You can add songs from SoundCloud by copy and pasting the URL shown here',
+            position: 'left'
+          },
          {
            element: '#player-area',
            intro: 'The audio playback may be controlled with the controls here. Basic music visualization effects may be shown here by selecting them from the menu ( eyeball icon in the bottom right ).'
@ -193,10 +201,10 @@ export default Component.extend({
      });

      intro.onchange((element) => {
-        if(element.id === '' || element.id === 'music-tab' || element.id === 'playlist' || element.id === 'player-area' || element.id === 'beat-option-row' || element.id === 'beat-option-button-group' || element.id === 'beat-container' || element.id === 'using-mic-audio-tooltip'){
-          $('.navigation-item').eq(0).click();
-        } else {
+        if(element.id === '' || element.id === 'music-tab' || element.id === 'playlist' || element.id === 'player-area' || element.id === 'beat-option-row' || element.id === 'beat-option-button-group' || element.id === 'beat-container' || element.id === 'using-mic-audio-tooltip' || element.nodeName === 'MD-MENU'){
          $('.navigation-item').eq(1).click();
+        } else {
+          $('.navigation-item').eq(0).click();
        }

        if(element.id === 'music-tab' || element.id === 'playlist' || element.id === 'player-area'){
--- a/web/app/pods/components/hue-controls/template.hbs
+++ b/web/app/pods/components/hue-controls/template.hbs
@ -1,32 +1,34 @@
 {{#if ready}}
-  <div id="navigation">
-    {{#each tabData as |tab|}}
-      <span class="navigation-item pointer text-uppercase {{if tab.selected "active"}}" {{action "changeTab" tab.name}}>{{tab.name}}</span>
-    {{/each}}
-    {{#paper-menu as |menu|}}
-      {{#menu.trigger}}
-        {{#paper-button iconButton=true}}
-          {{paper-icon "settings-icon" class=dimmerOnClass size=28}}
-        {{/paper-button}}
-      {{/menu.trigger}}
-      {{#menu.content width=3 as |content|}}
-        {{#content.menu-item onClick="toggleDimmer"}}
-          {{paper-icon "lightbulb outline" class=dimmerOnClass}} Dark Mode: {{if dimmerOn "On" "Off"}}
-        {{/content.menu-item}}
+  <div id="navigation" class="row">
+    <div class="col-sm-10 col-sm-offset-1 col-xs-12">
+      {{#each tabData as |tab|}}
+        <span class="navigation-item pointer text-uppercase {{if tab.selected "active"}}" {{action "changeTab" tab.name}}>{{tab.name}}</span>
+      {{/each}}
+      {{#paper-menu as |menu|}}
+        {{#menu.trigger}}
+          {{#paper-button iconButton=true}}
+            {{paper-icon "settings-icon" class=dimmerOnClass size=28}}
+          {{/paper-button}}
+        {{/menu.trigger}}
+        {{#menu.content width=3 as |content|}}
+          {{#content.menu-item onClick="toggleDimmer"}}
+            {{paper-icon "lightbulb outline" class=dimmerOnClass}} Dark Mode: {{if dimmerOn "On" "Off"}}
+          {{/content.menu-item}}

-        {{#content.menu-item onClick="clearBridge"}}
-          {{paper-icon "compare arrows" class=dimmerOnClass}} Switch bridge
-        {{/content.menu-item}}
+          {{#content.menu-item onClick="clearBridge"}}
+            {{paper-icon "compare arrows" class=dimmerOnClass}} Switch bridge
+          {{/content.menu-item}}

-        {{#content.menu-item onClick="startIntro"}}
-          {{paper-icon "cached" class=dimmerOnClass}} Restart tutorial
-        {{/content.menu-item}}
+          {{#content.menu-item onClick="startIntro"}}
+            {{paper-icon "cached" class=dimmerOnClass}} Restart tutorial
+          {{/content.menu-item}}

-        {{#content.menu-item onClick="clearAllSettings"}}
-          {{paper-icon "settings backup restore" class=dimmerOnClass}} Reset settings
-        {{/content.menu-item}}
-      {{/menu.content}}
-    {{/paper-menu}}
+          {{#content.menu-item onClick="clearAllSettings"}}
+            {{paper-icon "settings backup restore" class=dimmerOnClass}} Reset settings
+          {{/content.menu-item}}
+        {{/menu.content}}
+      {{/paper-menu}}
+    </div>
  </div>

  {{light-group lightsData=lightsData activeLights=activeLights syncLight=syncLight apiURL=apiURL dimmerOn=dimmerOn storage=storage}}
--- a/web/app/pods/components/lights-tab/component.js
+++ b/web/app/pods/components/lights-tab/component.js
@ -9,7 +9,7 @@ const {
 } = Ember;

 export default Component.extend({
-  classNames: ['col-sm-8', 'col-sm-offset-2', 'col-xs-12'],
+  classNames: ['col-sm-10', 'col-sm-offset-1', 'col-xs-12'],
  classNameBindings: ['active::hidden'],
  elementId: 'lights-tab',

--- a/web/app/pods/components/music-tab/mixins/helpers.js
+++ b/web/app/pods/components/music-tab/mixins/helpers.js
@ -12,7 +12,7 @@ const {
 } = Ember;

 export default Mixin.create({
-  classNames: ['col-sm-8', 'col-sm-offset-2', 'col-xs-12'],
+  classNames: ['col-sm-10', 'col-sm-offset-1', 'col-xs-12'],
  classNameBindings: ['active::hidden'],
  elementId: 'music-tab',

--- a/web/app/styles/hue-controls.scss
+++ b/web/app/styles/hue-controls.scss
@ -38,7 +38,6 @@
 }

 #navigation {
-  max-width: 800px;
  padding: 15px 0;
  text-align: center;
  margin: auto;
--- a/web/app/styles/introjs.scss
+++ b/web/app/styles/introjs.scss
@ -8,6 +8,7 @@

 .introjs-tooltip {
  color: $blackish;
+  width: 300px;
 }

 .introjs-skipbutton {
--- a/web/app/styles/music-tab.scss
+++ b/web/app/styles/music-tab.scss
@ -309,7 +309,6 @@
  border: 1px solid black;
  width: 100%;
  background: white;
-  padding-bottom: 20px;
  border-bottom-left-radius: 5px;
  border-bottom-right-radius: 5px
 }
@ -421,11 +420,16 @@
 #soundcloud-logo {
  display: block;
 }
+
 #soundcloud-logo-small {
  display: none;
 }

-@media(max-width:900px) {
+#soundcloud-tutorial {
+  width: 100%;
+}
+
+@media(max-width:1100px) {
  #soundcloud-logo {
    display: none;
  }
@ -434,7 +438,7 @@
  }
 }

-@media(min-width:767px) and (max-width:1000px) {
+@media(min-width:767px) and (max-width:1200px) {
  #add-new-music-label {
    display: none;
  }
--- a/web/package.json
+++ b/web/package.json
@ -27,7 +27,7 @@
    "ember-cli-htmlbars": "^1.0.1",
    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
    "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-nouislider": "^0.10.0",
+    "ember-cli-nouislider": "^0.11.0",
    "ember-cli-qunit": "^1.2.1",
    "ember-cli-release": "0.2.8",
    "ember-cli-sass": "^5.2.1",
@ -35,7 +35,7 @@
    "ember-cli-test-loader": "^1.1.0",
    "ember-cli-uglify": "^1.2.0",
    "ember-export-application-global": "^1.0.4",
-    "ember-load-initializers": "^0.5.0",
+    "ember-load-initializers": "^0.6.3",
    "ember-modal-dialog": "^0.9.0",
    "ember-notify": "^5.0.4",
    "ember-paper": "^1.0.0-alpha.11",
--- a/web/public/assets/images/soundcloudUrl.png
+++ b/web/public/assets/images/soundcloudUrl.png
--- a/web/yarn.lock
+++ b/web/yarn.lock
@ -177,6 +177,10 @@ ast-types@0.8.12:
  version "0.8.12"
  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"

+ast-types@0.8.15:
+  version "0.8.15"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52"
+
 ast-types@0.9.2:
  version "0.9.2"
  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.2.tgz#2cc19979d15c655108bf565323b8e7ee38751f6b"
@ -867,12 +871,12 @@ can-symlink@^1.0.0:
    tmp "0.0.28"

 caniuse-db@^1.0.30000153, caniuse-db@^1.0.30000214:
-  version "1.0.30000597"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000597.tgz#b52e6cbe9dc83669affb98501629feaee1af6588"
+  version "1.0.30000600"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000600.tgz#2d0892f77eebb399c3c17b3ecb72da7b8740f31f"

 capture-exit@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.0.7.tgz#69b4023241347a9b3db9f13eb91d22765e9a86f8"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.1.0.tgz#d931b32b11c2bd20ae57f34af0c1eb2c18781626"
  dependencies:
    rsvp "^3.3.3"

@ -952,8 +956,8 @@ clean-css-promise@^0.1.0:
    pinkie-promise "^2.0.0"

 clean-css@^3.4.5:
-  version "3.4.22"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.22.tgz#db323064f752028778233b58c54cd8535f860892"
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.23.tgz#604fbbca24c12feb59b02f00b84f1fb7ded6d001"
  dependencies:
    commander "2.8.x"
    source-map "0.4.x"
@ -1268,8 +1272,8 @@ debug@2.2.0, debug@~2.2.0:
    ms "0.7.1"

 debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.4.5.tgz#34c7b12a1ca96674428f41fe92c49b4ce7cd0607"
  dependencies:
    ms "0.7.2"

@ -1442,7 +1446,7 @@ ember-cli-babel@5.1.10:
    ember-cli-version-checker "^1.0.2"
    resolve "^1.1.2"

-ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6:
+ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.1.tgz#14a1a7b3ae9e9f1284f7bcdb142eb53bd0b1b5bd"
  dependencies:
@ -1487,7 +1491,7 @@ ember-cli-htmlbars-inline-precompile@^0.3.1:
    ember-cli-htmlbars "^1.0.0"
    hash-for-dep "^1.0.2"

-ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.0:
+ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.1.1.tgz#8776cf59796dac8f32e8625fc6d1ea45ffa55de1"
  dependencies:
@ -1537,12 +1541,12 @@ ember-cli-normalize-entity-name@^1.0.0:
  dependencies:
    silent-error "^1.0.0"

-ember-cli-nouislider@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-nouislider/-/ember-cli-nouislider-0.10.0.tgz#94bda98cc3d8809cbceb41cdf151b715528e5570"
+ember-cli-nouislider@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-nouislider/-/ember-cli-nouislider-0.11.0.tgz#645cf05be1e977376f2567b5b6ac845fe7c71314"
  dependencies:
-    ember-cli-babel "^5.1.6"
-    ember-cli-htmlbars "^1.0.3"
+    ember-cli-babel "^5.1.7"
+    ember-cli-htmlbars "^1.0.10"

 ember-cli-path-utils@^1.0.0:
  version "1.0.0"
@ -1632,7 +1636,7 @@ ember-cli-valid-component-name@^1.0.0:
  dependencies:
    silent-error "^1.0.0"

-ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7:
+ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.2.0.tgz#caa286b77d1b485df5d2f62c67a6f19aa8b582c4"
  dependencies:
@ -1732,16 +1736,16 @@ ember-composability-tools@0.0.5:
    ember-wormhole "0.4.1"

 ember-concurrency@^0.7.9:
-  version "0.7.15"
-  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.15.tgz#a35577e20220e9ddc93b0b801dbb9fd7554aca49"
+  version "0.7.17"
+  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.17.tgz#28f963c96fa5d1c42bb4b239c0212220d849738f"
  dependencies:
    ember-cli-babel "^5.1.5"
-    ember-getowner-polyfill "1.0.1"
+    ember-getowner-polyfill "^1.1.0"
    ember-maybe-import-regenerator "^0.1.4"

-ember-css-transitions@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.7.tgz#ceac6c5d09744fac7e6aee5b6a9e1d107bc50a7e"
+ember-css-transitions@0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.8.tgz#2c9454b4cc1db367849a4f8a7e8c4b082bb97d19"
  dependencies:
    ember-cli-babel "^5.1.6"

@ -1751,15 +1755,18 @@ ember-export-application-global@^1.0.4:
  dependencies:
    ember-cli-babel "^5.1.10"

-ember-getowner-polyfill@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.0.1.tgz#f60a31d25d642461dac4b4746184afaf7f5084ae"
+ember-getowner-polyfill@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.1.1.tgz#6bb6603827dd2f8f33be2434570a86cc9e5273ff"
  dependencies:
-    ember-cli-babel "^5.1.5"
+    ember-cli-babel "^5.1.6"
+    ember-cli-version-checker "^1.2.0"

-ember-load-initializers@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-0.5.1.tgz#76e3db23c111dbdcd3ae6f687036bf0b56be0cbe"
+ember-load-initializers@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-0.6.3.tgz#f47396ad271ba77294068c98f992a5f19705441a"
+  dependencies:
+    ember-cli-babel "^5.1.6"

 ember-maybe-import-regenerator@^0.1.4:
  version "0.1.4"
@ -1789,8 +1796,8 @@ ember-notify@^5.0.4:
    object-assign "^4.1.0"

 ember-paper@^1.0.0-alpha.11:
-  version "1.0.0-alpha.11"
-  resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.11.tgz#200a729a8bb9e1cc0fe2788785e5b404d18fd291"
+  version "1.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.12.tgz#9d686e5a05afd89f3143c0e72153d9c7f02b5b2a"
  dependencies:
    angular-material-source angular/material#v1.0.6
    broccoli-autoprefixer "^3.0.0"
@ -1798,9 +1805,9 @@ ember-paper@^1.0.0-alpha.11:
    broccoli-funnel "^1.0.1"
    broccoli-merge-trees "^1.1.0"
    ember-basic-dropdown "^0.16.0"
-    ember-cli-babel "^5.1.6"
+    ember-cli-babel "^5.1.7"
    ember-composability-tools "0.0.5"
-    ember-css-transitions "0.1.7"
+    ember-css-transitions "0.1.8"
    ember-power-select "1.0.0-beta.23"
    ember-wormhole "0.4.1"
    resolve "^1.1.7"
@ -2165,7 +2172,7 @@ faye-websocket@~0.10.0:

 fb-watchman@^1.8.0:
  version "1.9.0"
-  resolved "http://registry.npmjs.org/fb-watchman/-/fb-watchman-1.9.0.tgz#6f268f1f347a6b3c875d1e89da7e1ed79adfc0ec"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.0.tgz#6f268f1f347a6b3c875d1e89da7e1ed79adfc0ec"
  dependencies:
    bser "^1.0.2"

@ -2312,8 +2319,8 @@ fs-readdir-recursive@^0.1.0:
  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"

 fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.5.tgz#7825b4db454225dd114e7abd58e8926fe068cbff"
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.6.tgz#342665749e8dca406800b672268c8f5073f3e623"
  dependencies:
    heimdalljs-logger "^0.1.7"
    object-assign "^4.1.0"
@ -2423,11 +2430,7 @@ getpass@^0.1.1:
  dependencies:
    assert-plus "^1.0.0"

-git-repo-info@^1.0.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.3.1.tgz#0c1a19ef1964b822a7230f087396af80481ce8ec"
-
-git-repo-info@~1.2.0:
+git-repo-info@^1.0.4, git-repo-info@~1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.2.0.tgz#43d8513e04a24dd441330a2f7c6655a709fdbaf2"

@ -2594,10 +2597,11 @@ has-unicode@^2.0.0, has-unicode@~2.0.1:
  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"

 hash-for-dep@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.0.3.tgz#b57f18a0ace56380951638a3b36a6b73d8619b8b"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.0.4.tgz#8774e7b80c7c07be3bdc58b55278a4c6865d3737"
  dependencies:
    broccoli-kitchen-sink-helpers "^0.3.1"
+    heimdalljs "^0.2.3"
    resolve "^1.1.6"

 hawk@~3.1.3:
@ -2622,7 +2626,7 @@ heimdalljs-logger@^0.1.7:
    debug "^2.2.0"
    heimdalljs "^0.2.0"

-heimdalljs@^0.2.0, heimdalljs@^0.2.1:
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3:
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.3.tgz#35b82a6a4d73541fc4fb88d2fe2b23608fb4f779"
  dependencies:
@ -3530,7 +3534,7 @@ minimatch@^2.0.3:
  dependencies:
    brace-expansion "^1.0.0"

-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"

@ -3538,10 +3542,6 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@ -4117,11 +4117,11 @@ q@^1.1.2:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"

-qs@6.2.0, qs@^6.2.0, qs@~6.2.0:
+qs@6.2.0, qs@~6.2.0:
  version "6.2.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"

-qs@~6.3.0:
+qs@^6.2.0, qs@~6.3.0:
  version "6.3.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"

@ -4284,7 +4284,7 @@ realize-package-specifier@~3.0.3:
    dezalgo "^1.0.1"
    npm-package-arg "^4.1.1"

-recast@0.10.33, recast@^0.10.10:
+recast@0.10.33:
  version "0.10.33"
  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
  dependencies:
@ -4293,6 +4293,15 @@ recast@0.10.33, recast@^0.10.10:
    private "~0.1.5"
    source-map "~0.5.0"

+recast@^0.10.10:
+  version "0.10.43"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f"
+  dependencies:
+    ast-types "0.8.15"
+    esprima-fb "~15001.1001.0-dev-harmony-fb"
+    private "~0.1.5"
+    source-map "~0.5.0"
+
 recast@^0.11.17, recast@^0.11.3:
  version "0.11.18"
  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.18.tgz#07af6257ca769868815209401d4d60eef1b5b947"