Merge branch 'master' of https://github.com/Abijeet/BookStack

diff --cc app/Page.php
Simple merge

diff --cc app/Services/PermissionService.php
Simple merge

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

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

diff --cc resources/assets/sass/styles.scss
index cd43650ee8c7f8fab22e13f551e1312f6e20a3aa,50c3a50b2b8cce231cfc6fe46cf1d8052ec7f5ee..60071b9efd6da491058204cbe710cf88abc47094
--- 1/resources/assets/sass/styles.scss
--- 2/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@@ -17,9 -16,12 +17,13 @@@
  @import "header";
  @import "lists";
  @import "pages";
 +@import "comments";
  
- [v-cloak], [v-show] {display: none;}
+ [v-cloak], [v-show] {
+   display: none; opacity: 0;
+   animation-name: none !important;
+ }
+ 
  
  [ng\:cloak], [ng-cloak], .ng-cloak {
    display: none !important;

diff --cc resources/lang/en/entities.php
Simple merge

diff --cc routes/web.php
Simple merge