Merge pull request #381 from mattermost/mm-1705

MM-1705 add google as an oauth single-sign-on service

web/react/pages/channel.jsx

@@ -55,16 +55,17 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
         id: team_id
     });
 
-    React.render(
-        <ErrorBar/>,
-        document.getElementById('error_bar')
-    );
-
+    // ChannelLoader must be rendered first
     React.render(
         <ChannelLoader/>,
         document.getElementById('channel_loader')
     );
 
+    React.render(
+        <ErrorBar/>,
+        document.getElementById('error_bar')
+    );
+
     React.render(
         <Navbar teamDisplayName={team_name} />,
         document.getElementById('navbar')