Merge branch 'master' into translations

diff --cc app/Http/Controllers/Auth/RegisterController.php
Simple merge

diff --cc resources/assets/sass/_lists.scss
Simple merge

diff --cc resources/views/pages/show.blade.php
Simple merge

diff --cc resources/views/pages/sidebar-tree-list.blade.php
index 74ce6c34dc4b59b61d27f349630c3d7cc07aa8c9,5309cb7748aa452f0651a7a03ae0332100f78cdf..87eebed493a038b35dfe67f2be9f97ccf2c7d0f7
--- 1/resources/views/pages/sidebar-tree-list.blade.php
--- 2/resources/views/pages/sidebar-tree-list.blade.php
+++ b/resources/views/pages/sidebar-tree-list.blade.php
@@@ -1,11 -1,27 +1,27 @@@
  
  <div class="book-tree" ng-non-bindable>
  
+     @if(isset($page) && $page->tags->count() > 0)
+         <div class="tag-display">
+             <h6 class="text-muted">Page Tags</h6>
+             <table>
+                 <tbody>
+                 @foreach($page->tags as $tag)
+                     <tr class="tag">
+                         <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
+                         @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
+                     </tr>
+                 @endforeach
+                 </tbody>
+             </table>
+         </div>
+     @endif
+ 
      @if (isset($page) && $page->attachments->count() > 0)
 -        <h6 class="text-muted">Attachments</h6>
 +        <h6 class="text-muted">{{ trans('entities.pages_attachments') }}</h6>
          @foreach($page->attachments as $attachment)
              <div class="attachment">
 -                <a href="{{ $attachment->getUrl() }}" @if($attachment->external) target="_blank" @endif><i class="zmdi zmdi-{{ $attachment->external ? 'open-in-new' : 'file' }}"></i> {{ $attachment->name }}</a>
 +                <a href="{{ $attachment->getUrl() }}" @if($attachment->external) target="_blank" @endif><i class="zmdi zmdi-{{ $attachment->external ? 'open-in-new' : 'file' }}"></i>{{ $attachment->name }}</a>
              </div>
          @endforeach
      @endif

diff --cc routes/web.php
Simple merge