Getting the latest changes

diff --cc resources/assets/js/directives.js
Simple merge

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

diff --cc resources/views/pages/show.blade.php
index db1d1e5cdbab4d66ebb9a7f64f7abe4359fca330,6b2dc3c2319a7c7656fe4fb86c9926ed57dcb787..480a7603e515505f028e704c66a556d4a9b2d33d
--- 1/resources/views/pages/show.blade.php
--- 2/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@@ -109,15 -109,7 +109,13 @@@
  
          </div>
      </div>
--
 +    <div class="container">
 +        <div class="row">
 +            <div class="col-md-9">
 +                @include('comments/comments', ['pageId' => $page->id])
 +            </div>
 +        </div>
-     </div>
-     @include('partials/highlight')
++    </div>    
  @stop
  
  @section('scripts')