Merge branch 'master' into typos

web/react/components/user_settings/manage_incoming_hooks.jsx

@@ -148,7 +148,7 @@ export default class ManageIncomingHooks extends React.Component {
 
         return (
             <div key='addIncomingHook'>
-                {'Create webhook URLs for channels and private groups. These URLs can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'}
+                {'For developers building integrations this page lets you create webhook URLs for channels and private groups. Please see http://mattermost.org/webhooks to learn about creating webhooks, view samples, and to let the community know about integrations you have built. The URLs created below can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'}
                 <br/>
                 <label className='control-label'>{'Add a new incoming webhook'}</label>
                 <div className='padding-top'>

web/react/components/user_settings/user_settings_integrations.jsx

@@ -49,7 +49,7 @@ export default class UserSettingsIntegrationsTab extends React.Component {
             incomingHooksSection = (
                 <SettingItemMin
                     title='Incoming Webhooks'
-                    describe='Manage your incoming webhooks'
+                    describe='Manage your incoming webhooks (Developer feature)'
                     updateSection={function updateNameSection() {
                         this.updateSection('incoming-hooks');
                     }.bind(this)}

web/templates/head.html

@@ -37,7 +37,7 @@
     <script src="/static/js/bootstrap-3.3.5.js"></script>
     <script src="/static/js/bootstrap-colorpicker.min.js"></script>
     <script src="/static/js/react-bootstrap-0.25.1.js"></script>
-    <script src="/static/js/perfect-scrollbar-0.6.5.jquery.js"></script>
+    <script src="/static/js/perfect-scrollbar-0.6.5.jquery.min.js"></script>
     <script src="/static/js/jquery-dragster/jquery.dragster.js"></script>
 
     <style id="antiClickjack">body{display:none !important;}</style>