Merge branch 'master' into wip-v1.5.2

circle.yml

@@ -4,7 +4,10 @@ machine:
     - mongodb
   environment:
     MONGO_URI: mongodb://127.0.0.1/crowi_test
+  node:
+      version: 4.6.2
+  post:
+    - npm install -g npm@3
 notify:
   webhooks:
     - url: https://webhooks.gitter.im/e/5a035388e3274b621d20
-

lib/views/admin/notification.html

@@ -158,7 +158,7 @@
       </p>
 
       <h4>2. Get <code>clientId</code> and <code>clientSecret</code></h4>
-      <h4>3. After clientId nad clientSecret set, click "Connect to Slack" button to start OAuth process.</h4>
+      <h4>3. After clientId and clientSecret set, click "Connect to Slack" button to start OAuth process.</h4>
       <h4>4. Configure Slack on this notification setting screen</h4>
       {% endif %}