Merge remote-tracking branch 'remotes/seblucas/master'

Conflicts:
	lang/Localization_nl.json

index.php

@@ -3,7 +3,7 @@
  * COPS (Calibre OPDS PHP Server) HTML main script
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Sébastien Lucas <sebastien@slucas.fr>
+ * @author     Sébastien Lucas <sebastien@slucas.fr>
  *
  */
 
@@ -61,10 +61,11 @@
 <?php
 if (useServerSideRendering ()) {
     // Get the data
-    $data = getJson (true);
+    require_once ("JSON_renderer.php");
+    $data = JSONRenderer::getJson (true);
 
     echo serverSideRender ($data);
 }
 ?>
 </body>
-</html>
+</html>