Merge branch 'dev' of https://github.com/oslabs-beta/OverVue into dev

Author: JaceCrowe

package.json

@@ -1,6 +1,6 @@
 {
   "name": "overvue",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "Vue Prototype DevTool",
   "productName": "OverVue",
   "cordovaId": "org.cordova.quasar.app",

quasar.conf.js

@@ -168,8 +168,8 @@ module.exports = configure(function (ctx) {
       },
 
       manifest: {
-        name: `OverVue6.0`,
-        short_name: `OverVue6.0`,
+        name: `OverVue7.0`,
+        short_name: `OverVue7.0`,
         description: `A Quasar Framework app`,
         display: "standalone",
         orientation: "portrait",

src/components/left-sidebar/ComponentTab/CreateMenu.vue

@@ -8,7 +8,7 @@ Description:
 <template>
   <div class="create-component-div drawer-menu">
     <q-expansion-item group="accordion" label="Import Component">
-      <ImportComponent v-if="activeComponent === ''" @imported="createComponent" title="Import Component" class="sidebar-btn"/>
+      <ImportComponent v-if="activeComponent === ''" @imported="createComponent" title="Import Component (coming soon)" class="sidebar-btn" :disable = "true"/>
     </q-expansion-item>
     <q-expansion-item group="accordion" label="Create Component">
       <form class="create-component-form" v-on:submit.prevent="createComponent">

src/components/right-sidebar/tutorial/NewVersionInfo.vue

@@ -24,7 +24,7 @@
 
     <p class="info-sub-heading">Add class, id, and v-model Attributes </p>
     <p class="infoContent">There are multiple ways to add attributes.
-      One method is to click on the HTML Attributes drop down button. Specify the attribute by selecting either id or
+      One method is to click on the Component Attributes drop down button. Specify the attribute by selecting either id or
       class. Click the <img style="vertical-align:middle" alt="save" src="../../../assets/plussign.png"
         class="tut-image"> or enter to apply the attribute. <br>
       Another method is to double click the purple HTML tag.<img style="vertical-align:middle" alt="save"