From d8e609df2df876569a3e75161c328e28509aa6c1 Mon Sep 17 00:00:00 2001
From: JAMES ZHANG <jzhang300@us.ibm.com>
Date: Wed, 18 May 2016 15:40:40 -0500
Subject: [PATCH] update credentials, update watson-developer-cloud npm, move
 descriptions

---
 app.js          |  8 ++++----
 package.json    |  2 +-
 views/index.ejs | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app.js b/app.js
index d706def3..5e0aecd1 100755
--- a/app.js
+++ b/app.js
@@ -26,10 +26,10 @@ require('./config/express')(app);
 // Create the service wrapper
 var toneAnalyzer = watson.tone_analyzer({
   url: 'https://gateway.watsonplatform.net/tone-analyzer-beta/api/',
-  username: '9048d9c1-2e11-4fba-a0f7-b7f13ce15f24',
-  password: 'neDUB7VGk6Fy',
-  version_date: '2016-11-02',
-  version: 'v3-beta'
+  username: '<username>',
+  password: '<password>',
+  version_date: '2016-05-19',
+  version: 'v3'
 });
 
 app.get('/', function(req, res) {
diff --git a/package.json b/package.json
index fd84550a..4c392670 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "express-rate-limit": "^2.1.0",
     "express-secure-only": "^0.2.1",
     "helmet": "^1.3.0",
-    "watson-developer-cloud": "^1.2.5"
+    "watson-developer-cloud": "https://github.com/watson-developer-cloud/node-sdk.git"
   },
   "devDependencies": {
     "codecov": "^1.0.1",
diff --git a/views/index.ejs b/views/index.ejs
index 189d00d4..5e059a97 100755
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -119,14 +119,6 @@
         <h2 class="base--h2">Output</h2>
         <p class="base--p output--document-description">The Tone Analyzer Service analyzes text at the document level and the sentence level. Use the document level analysis to get a sense of the overall tone of the document, and use the sentence level analysis to identify specific areas of your content where tones are the strongest.</p>
         <h3 class="base--h3 output--document-title">Document-level</h3>
-        <div class="summary--row">
-          <div class="summary--emotion-description">
-            <p class="base--p">The Emotion graph represents the likelihood that an emotion tone is present in the text. <a class="base--a" target="_blank" href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/tone-analyzer/understanding-tone.shtml#emotional">Learn more</a>.</p>
-          </div>
-          <div class="summary--writing-and-social-description">
-            <p class="base--p">The Language Style and Social Tendencies graphs represent the amount of a language or social tone present in the text. <a class="base--a" target="_blank" href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/tone-analyzer/understanding-tone.shtml#social">Learn more</a>.</p>
-          </div>
-        </div>
         <div class="summary--row">
           <div class="summary--emotion">
             <h5 class="base--h5 summary--header">Emotion</h5>
@@ -141,6 +133,14 @@
             <div class="summary-social-graph bar-graph"></div>
           </div>
         </div>
+        <div class="summary--row">
+          <div class="summary--emotion-description">
+            <p class="base--p">The Emotion graph represents the likelihood that an emotion tone is present in the text. <a class="base--a" target="_blank" href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/tone-analyzer/understanding-tone.shtml#emotional">Learn more</a>.</p>
+          </div>
+          <div class="summary--writing-and-social-description">
+            <p class="base--p">The Language Style and Social Tendencies graphs represent the amount of a language or social tone present in the text. <a class="base--a" target="_blank" href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/tone-analyzer/understanding-tone.shtml#social">Learn more</a>.</p>
+          </div>
+        </div>
         <div class="summary-row">
           <span class="icon-hyperlink summary-view-code-button">
   					<img class="icon icon-code" src="images/icons/code.svg" />