22 files changed, 277 insertions, 106 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a21f118b9..3af4a6ae6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,32 @@
 # Mattermost Changelog
 
-## UNDER DEVELOPMENT Release v1.2.0
+## Release v1.2.0
 
-The "UNDER DEVELOPMENT" section of the Mattermost changelog appears in the product's `master` branch to note key changes committed to master and are on their way to the next stable release. When a stable release is pushed the "UNDER DEVELOPMENT" heading is removed from the final changelog of the release. 
-
-- **Release candidate anticipated:** 2015-11-10
 - **Final release anticipated:** 2015-11-16
 
+### Release Highlights
+
+#### Outgoing webhooks
+
+- Mattermost users can now interact with external applications using [outgoing webhooks](https://github.com/mattermost/platform/blob/master/doc/integrations/webhooks/Outgoing-Webhooks.md)
+- An [application template](https://github.com/mattermost/mattermost-integration-giphy) demonstrating user queries sent to the Giphy search engine via Mattermost webhooks now available
+- A community application, [Matterbrige](https://github.com/42wim/matterbridge?files=1), shows how to use webhooks to connect Mattermost with IRC 
+
+#### Search Scope Modifiers 
+
+- Adding search term `in:[channel_url_name]` now limits searches within a specific channel
+- Adding search term `from:[username]` now limits searches to messages from a specific user
+
+#### Syntax Highlighting 
+
+- Syntax highlight for code blocks now available for `Diff, Apache, Makefile, HTTP, JSON, Markdown, Java, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, Coffee, C, SQL, Go, Ruby, Java, and ini`
+
+#### Usability Improvements 
+
+- Added tutorial to teach new users how to use Mattermost 
+- Various performance improvements to support teams with hundreds of users 
+- Direct Messages "More" menu now lets you search for users by username and real name
+
 ### Improvements 
 
 Onboarding 
@@ -18,7 +38,7 @@ Messaging and Notifications
 - Users can now search for teammates to add to **Direct Message** list via **More** menu
 - Users can now personalize Direct Messages list by removing users listed
 - Link previews - Adding URL with .gif file adds image below message
-- Added new browser tab alerts to indicate unread messages and mentions
+- Added new browser tab alerts to indicate unread messages and mentions 
 
 Search 
 
@@ -34,8 +54,8 @@ Integrations
 User Interface
 
 - Member list in Channel display now scrollable, and includes Message button to message channel members directly
-- Added ability to edit previous message by hitting UP arrow
-- Syntax highlighting added for code blocks
+- Added ability to edit previous message by hitting UP arrow 
+- Syntax highlighting added for code blocks 
    - Languages include `Diff, Apache, Makefile, HTTP, JSON, Markdown, Java, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, Coffee, C, SQL, Go, Ruby, Java, and ini`. 
    - Use by adding the name of the language on the first link of the code block, for example: ```python
    - Syntax color theme can be defined under **Account Settings** > **Appearance Settings** > **Custom Theme**
@@ -65,7 +85,7 @@ System Console
 - Fixed issue with the centre channel scroll position jumping when right hand side was opened and closed
 - Added support for simultaneous login to different teams in different browser tabs
 - Incoming webhooks no longer disrupted when channel is deleted
-
+- You can now paste a Mattermost incoming webhook URL into the same field designed for a Slack URL and integrations will work 
 ### Compatibility  
 
 - IE 11 new minimum version for IE, since IE 10 share fell below 5% on desktop 
@@ -75,7 +95,7 @@ System Console
 
 Multiple settings were added to [`config.json`](./config/config.json). These options can be modified in the System Console, or manually updated in the existing config.json file. This is a list of changes and their new default values in a fresh install: 
 - Under `TeamSettings` in `config.json`:
-  - Added: `"RestrictTeamNames": true` to control whether team names are restricted
+  - Added: `"RestrictTeamNames": true` to control whether team names can contain reserved words like www, admin, support, test, etc.
   - Added: `"EnableTeamListing": false` to control whether teams can be listed on the root page of the site
 - Under `ServiceSettings` in `config.json`
   - Added: `EnableOutgoingWebhooks": true` to turn on outgoing webhooks
@@ -99,6 +119,7 @@ The following is for informational purposes only, no action needed. Mattermost a
 
 #### Known Issues
 
+- When navigating to a page with new messages as well as message containing inline images added via markdown, the channel may move up and down while loading the inline images
 - Microsoft Edge does not yet support drag and drop 
 - After upgrading to v1.2 existing users will see the newly added tutorial tips upon login (this is a special case for v1.2 and will not happen in future upgrades)
 - Channel list becomes reordered when there are lowercase channel names in a Postgres database
diff --git a/doc/README.md b/doc/README.md
index 7ed20fba6..d062dee65 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -53,11 +53,20 @@ Procedures for upgrading the Mattermost server
 
 _Note: End user help documentation is a new feature being completed for the v1.2 release. The materials below are work in progress._
 
-- User Interface
- - [Manage Members](help/Manage-Members.md)
- - Team Settings 
-   - [Slack Import](help/Slack-Import.md)
+- Getting Started
+   - [Sign-in](help/Sign-in.md)
 
-- Messaging
- - [Mattermost Markdown Formatting](usage/Markdown.md)
+- User Interface
+   - Main Menu
+     - [Team Settings ](https://github.com/mattermost/platform/blob/help-docs-update/doc/help/Team-Settings.md)
+        - [General Settings](https://github.com/mattermost/platform/blob/help-docs-update/doc/help/Team-Settings.md#general) 
+        - [Slack Import](https://github.com/mattermost/platform/blob/help-docs-update/doc/help/Team-Settings.md#import-from-slack-beta)
+     - [Manage Members](help/Manage-Members.md)
+   - Messaging
+     - [Mattermost Markdown Formatting](usage/Markdown.md)
+   - [Search](help/Search.md)
+     
+- System Console
+  - Team
+    - [Team Statistics](help/system-console/Team-Statistics.md)
 
diff --git a/doc/developer/API.md b/doc/developer/API.md
index 4c4b2f04e..e5e5db2ba 100644
--- a/doc/developer/API.md
+++ b/doc/developer/API.md
@@ -12,7 +12,7 @@ Incoming webhooks allow external applications to post messages into Mattermost c
 
 In addition to supporting Slack's incoming webhook formatting, Mattermost webhooks offer full support of industry-standard markdown formatting, including headings, tables and in-line images. 
 
-### [Outgoing Webhooks (in Mattermost v1.2)](https://github.com/mattermost/platform/blob/master/doc/integrations/webhooks/Outgoing-Webhooks.md) 
+### [Outgoing Webhooks](https://github.com/mattermost/platform/blob/master/doc/integrations/webhooks/Outgoing-Webhooks.md) 
 
 Outgoing webhooks allow external applications to receive webhook events from events happening within Mattermost channels and private groups via JSON payloads via HTTP POST requests sent to incoming webhook URLs defined by your applications. 
 
diff --git a/doc/developer/tests/test-link-preview.md b/doc/developer/tests/test-link-preview.md
new file mode 100644
index 000000000..4061bda35
--- /dev/null
+++ b/doc/developer/tests/test-link-preview.md
@@ -0,0 +1,23 @@
+# Link Preview Tests
+
+Link previews should embed previews of the contents of a hyperlink from a message or comment in the center channel directly below the message or comment.
+
+Post location variation: 
+
+1. Post as message in center channel with RHS closed (link preview should render under message) 
+2. Post as message in center channel with RHS open (link preview should render under message) 
+3. Post as comment in RHS (link preview should not render) 
+4. View comment in center channel with RHS closed (link preview should render under message) 
+5. View comment in center channel with RHS open (link preview should render under message) 
+6. Search for post in RHS with link
+
+Post the following links one per message in the above variations: 
+
+Twitter Link Preview: 
+https://twitter.com/mattermosthq/status/664928489078820865
+
+Vine: 
+https://vine.co/v/eDeVgbFrt9L
+
+Wikipedia
+https://en.wikipedia.org/wiki/Princess_Bubblegum
diff --git a/doc/developer/tests/test-markdown.md b/doc/developer/tests/test-markdown.md
new file mode 100644
index 000000000..8a24aad86
--- /dev/null
+++ b/doc/developer/tests/test-markdown.md
@@ -0,0 +1,14 @@
+# Markdown tests
+
+Paste the following tests into Mattermost to test markdown support.
+
+```
+# This should render as Heading 1 font size 
+## This should render as Heading 2 font size 
+### This should render as Heading 3 font size 
+#### This should render as Heading 4 font size 
+##### This should render as Heading 5 font size 
+###### This should render as Heading 6 font size 
+~~This should show strikethrough formatting~~
+**This should be bold**
+```
diff --git a/doc/developer/tests/test-mentions.md b/doc/developer/tests/test-mentions.md
new file mode 100644
index 000000000..99a47e337
--- /dev/null
+++ b/doc/developer/tests/test-mentions.md
@@ -0,0 +1,13 @@
+# Mentions Testing 
+
+To test the following mention functional: 
+
+1. Add a user 'alice' to the system
+2. Paste the below text to test if mentions is properly highlighting
+
+
+```
+To run this test, if a user named @alice doesn't yet exist, create one. 
+
+I saw @alice--and I said "Hi @alice!" then "What's up @alice?" and then @alice, was totally @alice; she just "@alice"'d me and walked on by. That's @alice...
+```
diff --git a/doc/help/README.md b/doc/help/README.md
deleted file mode 100644
index 9271d64dd..000000000
--- a/doc/help/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Help
-
-The help section of the Mattermost documentation is intended for use by end users learning about the Mattermost concepts, usage, terminology and user interface.
-
-_Note: Help documentation is a work-in-progress. Community contributions highly welcome. Please see [guidelines for contributing](https://forum.mattermost.org/t/help-improve-mattermost-documentation/194)._
-
-## Team Site Main Menu 
-
-You can access the **Team Site Main Menu** by clicking on the three vertical dots at the top of the left sidebar in a team site. Here we describe the various options available from the menu: 
-
-- [Manage Members](Manage-Members.md)
-
diff --git a/doc/help/Sign-in.md b/doc/help/Sign-in.md
new file mode 100644
index 000000000..728a7d42c
--- /dev/null
+++ b/doc/help/Sign-in.md
@@ -0,0 +1,19 @@
+# Sign-in
+
+You can sign-in to your team from the web address of `https://domain.com/teamname`. 
+
+There are several options for signing in depending on how your System Administrator has configured your server. 
+
+#### Email address and password sign-in
+
+If available, you can sign in using the combination of email address and password used to create your account. 
+
+If you have forgotten your password, you should be able to reset it from the "I forgot my password" option on the sign-in screen, or contact your System Administrator if you need help resetting your password. 
+
+#### GitLab Single-Sign-On (SSO) option 
+
+If available, you can sign in using your GitLab account using a one-click sign-in option. GitLab SSO lets you create teams, create accounts on teams, and sign-in to teams using one username, email address and password that works across everything on the server. 
+
+#### Switching Teams
+
+You can switch among teams you've recently signed into using the main menu in any team site on the server. By default, devices remember which teams you have signed into for 30 days, and this duration is configurable by the System Administrator. 
diff --git a/doc/help/Slack-Import.md b/doc/help/Slack-Import.md
deleted file mode 100644
index f834d5177..000000000
--- a/doc/help/Slack-Import.md
+++ /dev/null
@@ -1,29 +0,0 @@
-### Slack Import
-
-*Note: As a proprietary SaaS service, Slack is able to change its export format quickly and without notice. If you encounter issues not mentioned in the documentation below, please alert the product team by [filing an issue](https://github.com/mattermost/platform/issues).*
-
-#### Usage
-
-The Slack Import feature in Mattermost is in "Beta" and focus is on supporting migration of teams of less than 100 registered users. To use: 
-
-1. Generate a Slack "Export" file from **Slack > Team Settings > Import/Export Data > Export > Start Export**  
-
-2. In Mattermost go to **Team Settings > Import > Import from Slack**. _Team Owner_ or _Team Administrator_ role is required to access this menu option.
-
-3. Click **Select file** to upload Slack export file and click **Import**.   
-
-4. Emails and usernames from Slack are used to create new Mattermost accounts  
-
-5. Slack users can activate their new Mattermost accounts by using Mattermost's Password Reset screen with their email addresses from Slack to set new passwords for their Mattermost accounts  
-
-6. Once logged in, the Mattermost users will have access to previous Slack messages in the public channels imported from Slack.
-
-**It is highly recommended that you test Slack import before applying it to an instance intended for production.** If you use Docker, you can spin up a test instance in one line (`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform`). If you don't use Docker, there are [step-by-step instructions](../install/Docker-Single-Container.md) to install Mattermost in preview mode in less than 5 minutes.
-
-#### Notes: 
-
-- Newly added markdown suppport in Slack's Posts 2.0 feature announced on September 28, 2015 is not yet supported. 
-- Slack does not export files or images your team has stored in Slack's database. Mattermost will provide links to the location of your assets in Slack's web UI.
-- Slack does not export any content from private groups or direct messages that your team has stored in Slack's database. 
-- In Beta, Slack accounts with username or email address collisions with existing Mattermost accounts will not import and mentions do not resolve as Mattermost usernames (still shows Slack ID). No pre-check or roll-back is currently offered. 
-
diff --git a/doc/help/Team-Settings.md b/doc/help/Team-Settings.md
new file mode 100644
index 000000000..7e6cf5dd5
--- /dev/null
+++ b/doc/help/Team-Settings.md
@@ -0,0 +1,70 @@
+## Team Settings 
+
+The Team Settings menu offers Team Administrators, Team Owners and System Administrators to adjust settings applying to a specific team. 
+
+The following settings are found in a Team Site from the **Three-Dot** menu at the top of the left sidebar under **Team Settings**. 
+
+### General  
+
+General settings under the **Team Settings** > **General** configure how a team is displayed to users. 
+
+#### Team Name
+
+Your **Team Name** is displayed on the sign-in page, and in the top of the left-hand sidebar for your team. 
+
+#### Allow anyone to sign-up from login page
+
+Setting this option to **Yes** a link to the account creation page is included on the sign-in page of this team. 
+
+Team Administrators would set this to **Yes** when they:  
+ 1. Operate on a closed network and want to make sign-up easy.  
+ 2. Operate on the open internet with sign-up restricted to specific domains, and want to allow easy sign-up from users with email addresses. Note: System Administrators can restrict sign-up to specific domains via the System Console.  
+ 3. Operate on the open internet and want to allow anyone to sign-up.
+
+Team Administrators would set this to **No** when they:  
+ 1. Operate on the open internet and want a small, private team that is email-invite-only 
+
+#### Include this team in the Team Directory
+
+Setting this option to **Yes** includes the Team Name on the Home Page and a link to this team's sign-in page. 
+
+Team Administrators would set this to **Yes** when they:  
+ 1. Operate on a closed network and want to make it easy to discover their team from the Home Page of the Mattermost server.
+ 2. Operate on the open internet with sign-up restricted to specific domains, and want to allow easy sign-up from users with email addresses. Note: System Administrators can restrict sign-up to specific domains via the System Console.  
+ 3. Operate on the open internet and want to allow anyone to sign-up to their team from the Home Page of the Mattermost server.
+
+Team Administrators would set this to **No** when they:  
+ 1. Operate on the open internet and want a small, private team that is email-invite-only 
+
+#### Invite Code 
+
+When allowing anyone to sign-up from the login page, the **Invite Code** is used as part of the sign-up process. Clicking **Re-Generate** will invalidate the previous invitations and invitation URLs. 
+
+### Import
+
+#### Import from Slack (Beta) 
+
+*Note: As a proprietary SaaS service, Slack is able to change its export format quickly and without notice. If you encounter issues not mentioned in the documentation below, please alert the product team by [filing an issue](https://github.com/mattermost/platform/issues).*
+
+The Slack Import feature in Mattermost is in "Beta" and focus is on supporting migration of teams of less than 100 registered users. To use: 
+
+1. Generate a Slack "Export" file from **Slack > Team Settings > Import/Export Data > Export > Start Export**  
+
+2. In Mattermost go to **Team Settings > Import > Import from Slack**. _Team Owner_ or _Team Administrator_ role is required to access this menu option.
+
+3. Click **Select file** to upload Slack export file and click **Import**.   
+
+4. Emails and usernames from Slack are used to create new Mattermost accounts  
+
+5. Slack users can activate their new Mattermost accounts by using Mattermost's Password Reset screen with their email addresses from Slack to set new passwords for their Mattermost accounts  
+
+6. Once logged in, the Mattermost users will have access to previous Slack messages in the public channels imported from Slack.
+
+**It is highly recommended that you test Slack import before applying it to an instance intended for production.** If you use Docker, you can spin up a test instance in one line (`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform`). If you don't use Docker, there are [step-by-step instructions](../install/Docker-Single-Container.md) to install Mattermost in preview mode in less than 5 minutes.
+
+#### Notes: 
+
+- Newly added markdown suppport in Slack's Posts 2.0 feature announced on September 28, 2015 is not yet supported. 
+- Slack does not export files or images your team has stored in Slack's database. Mattermost will provide links to the location of your assets in Slack's web UI.
+- Slack does not export any content from private groups or direct messages that your team has stored in Slack's database. 
+- In Beta, Slack accounts with username or email address collisions with existing Mattermost accounts will not import and mentions do not resolve as Mattermost usernames (still shows Slack ID). No pre-check or roll-back is currently offered. 
diff --git a/doc/help/Team-Statistics.md b/doc/help/Team-Statistics.md
deleted file mode 100644
index 05d63794b..000000000
--- a/doc/help/Team-Statistics.md
+++ /dev/null
@@ -1,24 +0,0 @@
-## Team Statistics
-___
-Statistics on users, posts and channels are tracked for each team and viewable in the System Console. System Administrators can access statistics for your Mattermost teams by clicking the **three-dot menu**, then click **System Console**. Under the *Teams* section on the left side you’ll see a list of the teams that belong to your domain. Click **Statistics** under the team of interest to open the stats page. Here is some helpful terminology:  
-
-**Total Users**  
-The total number of accounts created, regardless of if the accounts are active or inactive. 
-
-**Total Posts**  
-The total number of posts made by your team, including deleted posts or those made by incoming and outgoing webhook integrations.
-
-**Public Groups**  
-The number of public channels created by your team, including channels that may have been archived.
-
-**Private Group**  
-The number of private groups created by your team, including groups that may have been archived.
-
-**Active Users With Posts**  
-Users who logged in and made a post on a certain day.
-
-**Recently Active Users**  
-Users that have logged in and had recent browser activity in Mattermost.
-
-**Newly Created Users**  
-Users that have recently completed the signup process to create a Mattermost account on the team.
diff --git a/doc/help/system-console/Team-Statistics.md b/doc/help/system-console/Team-Statistics.md
new file mode 100644
index 000000000..eef7b8346
--- /dev/null
+++ b/doc/help/system-console/Team-Statistics.md
@@ -0,0 +1,24 @@
+# Team Statistics
+
+Statistics on users, posts and channels are tracked for each team are viewable under **System Console** > **Teams** > **Statistics**. 
+
+## Total Users
+The total number of accounts created, including both active and inactive accounts. 
+
+## Total Posts
+The total number of posts made in a team, including deleted posts and posts made using automation. 
+
+## Public Groups
+The number of public channels created by your team, including channels that may have been archived.
+
+## Private Group
+The number of private groups created by your team, including groups that may have been archived.
+
+## Active Users With Posts
+Users who logged in and made a post on a certain day.
+
+## Recently Active Users
+Users that have logged in and had recent browser activity in Mattermost.
+
+## Newly Created Users
+Users that have recently completed the sign-up process to create a Mattermost account on the team.
diff --git a/doc/process/documentation-guidelines.md b/doc/process/documentation-guidelines.md
index f186da6bd..e75bb3169 100644
--- a/doc/process/documentation-guidelines.md
+++ b/doc/process/documentation-guidelines.md
@@ -41,7 +41,7 @@ This procedure works on Linux servers running Python 2.6 and higher.
 
 ### Use headings  
 
-Headings in markdown provide anchors that can be used to easily reference sub-sections of long pieces of documentation. This is preferrable to just numbering sections without headings. 
+Headings in markdown provide anchors that can be used to easily reference sub-sections of long pieces of documentation. This is preferable to just numbering sections without headings. 
 
 ##### Correct: 
 
@@ -77,7 +77,24 @@ H3, H4, H5 headings should be "Sentence case" and can be any length.
 
 These headers are smaller and used to summarize sections. H3 can be considered either a large or small heading. 
 
-These conventions are new, so there's flexibility around them, when you're not sure, consider the convention here as default. 
+These conventions are new, so there's flexibility around them, when you're not sure, consider the convention here as default.
+
+### Sub-section headings should end with a colon
+
+For readability and clear layout, end a sub-section heading with a colon
+
+##### Correct: 
+
+---- 
+Service Based: 
+- [AWS Elastic Beanstalk Setup](https://github.com/mattermost/platform/blob/master/doc/install/Amazon-Elastic-Beanstalk.md)
+---- 
+##### Incorrect: 
+
+---- 
+Optional
+- [Community Guide for Production Debian Setup](https://github.com/mattermost/platform/blob/master/doc/install/Production-Debian.md)
+---- 
 
 ### One instruction per line
 
diff --git a/docker/1.2/Dockerfile b/docker/1.2/Dockerfile
index 6a8d69196..0e4e3e242 100644
--- a/docker/1.2/Dockerfile
+++ b/docker/1.2/Dockerfile
@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
 WORKDIR /mattermost
 
 # Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v1.2.0-rc1/mattermost.tar.gz /
+ADD https://github.com/mattermost/platform/releases/download/v1.2.0-rc2/mattermost.tar.gz /
 RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
 ADD config_docker.json /
 ADD docker-entry.sh /
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index ff53816c7..af29f219e 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -140,7 +140,9 @@ export default class Navbar extends React.Component {
                             role='menuitem'
                             href='#'
                             onClick={() => this.setState({showEditChannelPurposeModal: true})}
-                        />
+                        >
+                            {'Set Channel Purpose...'}
+                        </a>
                     </li>
                 );
             }
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index c57c4490b..617b4b36c 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -18,6 +18,7 @@ export default class PostBody extends React.Component {
         this.receivedYoutubeData = false;
         this.isGifLoading = false;
 
+        this.handleUserChange = this.handleUserChange.bind(this);
         this.parseEmojis = this.parseEmojis.bind(this);
         this.createEmbed = this.createEmbed.bind(this);
         this.createGifEmbed = this.createGifEmbed.bind(this);
@@ -25,7 +26,14 @@ export default class PostBody extends React.Component {
         this.createYoutubeEmbed = this.createYoutubeEmbed.bind(this);
 
         const linkData = Utils.extractLinks(this.props.post.message);
-        this.state = {links: linkData.links, message: linkData.text, post: this.props.post};
+        const profiles = UserStore.getProfiles();
+
+        this.state = {
+            links: linkData.links,
+            message: linkData.text,
+            post: this.props.post,
+            hasUserProfiles: profiles && Object.keys(profiles).length > 1
+        };
     }
 
     getAllChildNodes(nodeIn) {
@@ -55,12 +63,26 @@ export default class PostBody extends React.Component {
 
     componentDidMount() {
         this.parseEmojis();
+
+        UserStore.addChangeListener(this.handleUserChange);
     }
 
     componentDidUpdate() {
         this.parseEmojis();
     }
 
+    componentWillUnmount() {
+        UserStore.removeChangeListener(this.handleUserChange);
+    }
+
+    handleUserChange() {
+        if (!this.state.hasProfiles) {
+            const profiles = UserStore.getProfiles();
+
+            this.setState({hasProfiles: profiles && Object.keys(profiles).length > 1});
+        }
+    }
+
     componentWillReceiveProps(nextProps) {
         const linkData = Utils.extractLinks(nextProps.post.message);
         if (this.props.post.filenames.length === 0 && this.state.links && this.state.links.length > 0) {
diff --git a/web/react/components/posts_view_container.jsx b/web/react/components/posts_view_container.jsx
index c76c8a57e..2cb56cd47 100644
--- a/web/react/components/posts_view_container.jsx
+++ b/web/react/components/posts_view_container.jsx
@@ -3,6 +3,7 @@
 
 const PostsView = require('./posts_view.jsx');
 const LoadingScreen = require('./loading_screen.jsx');
+const ChannelInviteModal = require('./channel_invite_modal.jsx');
 
 const ChannelStore = require('../stores/channel_store.jsx');
 const PostStore = require('../stores/post_store.jsx');
@@ -50,6 +51,7 @@ export default class PostsViewContainer extends React.Component {
             });
         }
 
+        state.showInviteModal = false;
         this.state = state;
     }
     componentDidMount() {
@@ -248,7 +250,7 @@ export default class PostsViewContainer extends React.Component {
                     postViewScrolled={this.handlePostsViewScroll}
                     loadMorePostsTopClicked={this.loadMorePostsTop}
                     numPostsToDisplay={this.state.numPostsToDisplay}
-                    introText={channel ? createChannelIntroMessage(channel) : null}
+                    introText={channel ? createChannelIntroMessage(channel, () => this.setState({showInviteModal: true})) : null}
                     messageSeparatorTime={this.state.currentLastViewed}
                 />
             );
@@ -263,7 +265,13 @@ export default class PostsViewContainer extends React.Component {
         }
 
         return (
-            <div id='post-list'>{postListCtls}</div>
+            <div id='post-list'>
+                {postListCtls}
+                <ChannelInviteModal
+                    show={this.state.showInviteModal}
+                    onModalDismissed={() => this.setState({showInviteModal: false})}
+                />
+            </div>
         );
     }
 }
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index b02ec0692..542f433f3 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -144,7 +144,7 @@ export default class Sidebar extends React.Component {
             }
         }
 
-        const hiddenDirectChannelCount = UserStore.getActiveOnlyProfileList().length - visibleDirectChannels.length;
+        const hiddenDirectChannelCount = UserStore.getActiveOnlyProfileList(true).length - visibleDirectChannels.length;
 
         visibleDirectChannels.sort(this.sortChannelsByDisplayName);
 
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 895d0c500..3dbed72c3 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -129,7 +129,6 @@ export default class CustomThemeChooser extends React.Component {
                     {'Copy and paste to share theme colors:'}
                 </label>
                 <input
-                    readOnly='true'
                     type='text'
                     className='form-control'
                     value={colors}
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx
index e0ecc37aa..40b64b34b 100644
--- a/web/react/stores/user_store.jsx
+++ b/web/react/stores/user_store.jsx
@@ -197,13 +197,13 @@ class UserStoreClass extends EventEmitter {
         return BrowserStore.getItem('profiles', {});
     }
 
-    getActiveOnlyProfiles() {
+    getActiveOnlyProfiles(skipCurrent) {
         const active = {};
         const profiles = this.getProfiles();
         const currentId = this.getCurrentId();
 
         for (var key in profiles) {
-            if (profiles[key].delete_at === 0 && profiles[key].id !== currentId) {
+            if (!(profiles[key].id === currentId && skipCurrent) && profiles[key].delete_at === 0) {
                 active[key] = profiles[key];
             }
         }
diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx
index 161c79761..f27e23a82 100644
--- a/web/react/utils/channel_intro_mssages.jsx
+++ b/web/react/utils/channel_intro_mssages.jsx
@@ -9,15 +9,15 @@ const ChannelStore = require('../stores/channel_store.jsx');
 const Constants = require('../utils/constants.jsx');
 const TeamStore = require('../stores/team_store.jsx');
 
-export function createChannelIntroMessage(channel) {
+export function createChannelIntroMessage(channel, showInviteModal) {
     if (channel.type === 'D') {
         return createDMIntroMessage(channel);
     } else if (ChannelStore.isDefault(channel)) {
         return createDefaultIntroMessage(channel);
     } else if (channel.name === Constants.OFFTOPIC_CHANNEL) {
-        return createOffTopicIntroMessage(channel);
+        return createOffTopicIntroMessage(channel, showInviteModal);
     } else if (channel.type === 'O' || channel.type === 'P') {
-        return createStandardIntroMessage(channel);
+        return createStandardIntroMessage(channel, showInviteModal);
     }
 }
 
@@ -71,7 +71,7 @@ export function createDMIntroMessage(channel) {
     );
 }
 
-export function createOffTopicIntroMessage(channel) {
+export function createOffTopicIntroMessage(channel, showInviteModal) {
     return (
         <div className='channel-intro'>
             <h4 className='channel-intro__title'>{'Beginning of ' + channel.display_name}</h4>
@@ -91,10 +91,8 @@ export function createOffTopicIntroMessage(channel) {
                 <i className='fa fa-pencil'></i>{'Set a header'}
             </a>
             <a
-                className='intro-links'
                 href='#'
-                data-toggle='modal'
-                data-target='#channel_invite'
+                onClick={showInviteModal}
             >
                 <i className='fa fa-user-plus'></i>{'Invite others to this channel'}
             </a>
@@ -155,7 +153,7 @@ export function createDefaultIntroMessage(channel) {
     );
 }
 
-export function createStandardIntroMessage(channel) {
+export function createStandardIntroMessage(channel, showInviteModal) {
     var uiName = channel.display_name;
     var creatorName = '';
 
@@ -206,14 +204,11 @@ export function createStandardIntroMessage(channel) {
                 <i className='fa fa-pencil'></i>{'Set a header'}
             </a>
             <a
-                className='intro-links'
                 href='#'
-                data-toggle='modal'
-                data-target='#channel_invite'
+                onClick={showInviteModal}
             >
                 <i className='fa fa-user-plus'></i>{'Invite others to this ' + uiType}
             </a>
-
         </div>
     );
 }
diff --git a/web/web.go b/web/web.go
index 1cae604ae..ffc791cb7 100644
--- a/web/web.go
+++ b/web/web.go
@@ -132,7 +132,7 @@ func watchAndParseTemplates() {
 	}
 }
 
-var browsersNotSupported string = "MSIE/8;MSIE/9;MSIE/10;Internet Explorer/8;Internet Explorer/9;Internet Explorer/10;Safari/7"
+var browsersNotSupported string = "MSIE/8;MSIE/9;MSIE/10;Internet Explorer/8;Internet Explorer/9;Internet Explorer/10;Safari/7;Safari/8"
 
 func CheckBrowserCompatability(c *api.Context, r *http.Request) bool {
 	ua := user_agent.New(r.UserAgent())
@@ -143,7 +143,7 @@ func CheckBrowserCompatability(c *api.Context, r *http.Request) bool {
 		version := strings.Split(browser, "/")
 
 		if strings.HasPrefix(bname, version[0]) && strings.HasPrefix(bversion, version[1]) {
-			c.Err = model.NewAppError("CheckBrowserCompatability", "Your current browser is not supported, please upgrade to one of the following browsers: Google Chrome 21 or higher, Internet Explorer 11 or higher, FireFox 14 or higher, Safari 8 or higher", "")
+			c.Err = model.NewAppError("CheckBrowserCompatability", "Your current browser is not supported, please upgrade to one of the following browsers: Google Chrome 21 or higher, Internet Explorer 11 or higher, FireFox 14 or higher, Safari 9 or higher", "")
 			return false
 		}
 	}