Merge branch 'develop' into test

@@ -2,7 +2,7 @@
     <h1>{{title}}</h1>
     <h1>{{title}}</h1>
     <h2>{{subtitle}}</h2>
     <h2>{{subtitle}}</h2>
     {{#if author}}
     {{#if author}}
-        <p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p>
+        <p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;<span class="detail-time" _time="{{time}}"></span></p>
     {{^}}
     {{^}}
         <p class="detail-category">{{class}}&nbsp;|&nbsp;<span class="detail-time" _time="{{time}}"></span></p>
         <p class="detail-category">{{class}}&nbsp;|&nbsp;<span class="detail-time" _time="{{time}}"></span></p>
     {{/if}}
     {{/if}}