updates from production: fix user.time_zone, precompile assets

app/views/apps/index.html.erb

@@ -45,15 +45,13 @@
         <% end %>
       </div>
 
-      <% if current_admin_user.present? %>
-        <div class="apps">
-          <%= link_to timecontrols_path do %>
-            <%= image_tag 'timecontrol.png', :size => '104x104' %>
-            <br>
-            <%= t(:timecontrol) %>
-          <% end %>
-        </div>
-      <% end %>
+      <div class="apps">
+        <%= link_to timecontrols_path do %>
+          <%= image_tag 'timecontrol.png', :size => '104x104' %>
+          <br>
+          <%= t(:timecontrol) %>
+        <% end %>
+      </div>
 
     </div>
   </div>

app/views/docs/channels/_update_feed.html.erb

@@ -10,7 +10,7 @@ To update a Channel feed, send an HTTP GET or POST to<br>
 <br><br>
 Valid parameters:
 <ul>
-  <li><b>api_key</b> (string) - Write API Key for this specific Channel (required).  The Write API Key can optionally be sent via an X-THINGSPEAKAPIKEY HTTP header.</li>
+  <li><b>api_key</b> (string) - Write API Key for this specific Channel (required).  The Write API Key can optionally be sent via a <%= HTTP_HEADER_API_KEY_NAME %> HTTP header.</li>
   <li><b>field1</b> (string) - Field 1 data (optional)</li>
   <li><b>field2</b> (string) - Field 2 data (optional)</li>
   <li><b>field3</b> (string) - Field 3 data (optional)</li>

app/views/users/show.html.erb

@@ -16,7 +16,7 @@
       </tr>
       <tr>
         <td><%= t(:time_zone) %></td>
-        <td><%= @user.time_zone %></td>
+        <td><%= @user.time_zone_or_utc %></td>
       </tr>
       <tr>
         <td><%= t(:api_key) %></td>