Merge branch 'disable-comments' of git://github.com/Abijeet/BookStack into Abijeet...

diff --cc resources/lang/de/settings.php
Simple merge

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

diff --cc resources/lang/es/settings.php
Simple merge

diff --cc resources/lang/fr/settings.php
Simple merge

diff --cc resources/lang/nl/settings.php
Simple merge

diff --cc resources/lang/pt_BR/settings.php
Simple merge

diff --cc resources/lang/sk/settings.php
Simple merge