diff --git a/apps.md b/apps.md
index 483b0f23..dfa9da4e 100644
--- a/apps.md
+++ b/apps.md
@@ -12,9 +12,9 @@
     <div class="panel-collapse collapse app_{app_id}">
       <div class="panel-body">
         <p><strong>Description</strong>: {app_description}</p>
-        <p><strong>Last update (UTC)x</strong>: {app_update}</p>
+        <p><strong>Last update (UTC)</strong>: {app_update}</p>
         <p><strong>Maintainer</strong>: {app_maintainer} <small class="text-muted">({app_mail})</small></p>
-        <p><strong>Git</strong>: {app_git} <small class="text-muted">({app_branch})</small></p>
+        <p><strong>Git</strong>: <a href="{app_git}" target="_blank">{app_git}</a> <small class="text-muted">({app_branch})</small></p>
         <a href="#/app_{app_id}" target="_blank" class="btn btn-default">Documentation</a>
     </div>
   </div>
@@ -51,7 +51,7 @@ $(document).ready(function () {
              .replace(/{app_id}/g, app_id)
              .replace(/{app_name}/g, infos.manifest.name)
              .replace('{app_description}', infos.manifest.description.en)
-             .replace('{app_git}', infos.git.url)
+             .replace(/{app_git}/g, infos.git.url)
              .replace('{app_branch}', infos.git.branch)
              .replace('{app_update}', timeConverter(infos.lastUpdate));
 
@@ -60,10 +60,11 @@ $(document).ready(function () {
           .replace('{app_maintainer}', infos.manifest.developer.name)
           .replace('{app_mail}', infos.manifest.developer.email);
       }
-      else {
+
+      if (infos.manifest.maintainer) {
         html = html
-          .replace('{app_maintainer}', 'unknown')
-          .replace('{app_mail}', 'unknown');
+          .replace('{app_maintainer}', infos.manifest.maintainer.name)
+          .replace('{app_mail}', infos.manifest.maintainer.email);
       }
 
       $('#app-accordion').append(html);
@@ -118,6 +119,7 @@ The packagers will appreciate your remarks. If you test them and find issues, or
 | [Ghost](http://ghost.org) | julien | <div class="ready"/> | https://github.com/julienmalik/ghost_ynh | Blogging platform |
 | [GLPI + FusionInventory](http://www.glpi-project.org/?lang=en) | beudbeud | <div class="ready"/> | https://github.com/abeudin/glpi_ynh | IT And Asset managent |
 | [Jeedom](http://jeedom.fr) | lunarok | <div class="ready"/> | https://github.com/lunarok/jeedom_ynh | Home automation |
+| [Jenkins](http://jenkins-ci.org/) | julien | <div class="ready"/> | https://github.com/julienmalik/jenkins_ynh | Continuous Integration platform |
 | [Kanboard](http://kanboard.net/) | tostaki | <div class=" ready"/> | https://github.com/mbugeia/kanboard_ynh | Visual task board |
 | [KiwiIRC](http://kiwiirc.com) | julien | <div class="ready"/> | https://github.com/julienmalik/kiwiirc_ynh | Web IRC client |
 | [Leed](http://projet.idleman.fr/leed/) | Maniack Crudelis | <div class="ready"/> | https://github.com/maniackcrudelis/leed_ynh | RSS reader |
@@ -147,7 +149,7 @@ The packagers will appreciate your remarks. If you test them and find issues, or
 | [Webmin](http://webmin.com) | tifred | <div class="inprogress"/> | https://github.com/drfred1981/webmin_ynh | Web-based system configuration tool |
 | [Yourls](http://yourls.org/) | courgette | <div class="ready"/> | https://github.com/courgette/yourls_ynh | URL Shortening service |
 | [Zomburl](http://cadav.re/) | courgette | <div class="inprogress"/> | https://github.com/courgette/zomburl_ynh | URL Shortening service |
-| [Jenkins](http://jenkins-ci.org/) | julien | <div class="inprogress"/> | https://github.com/julienmalik/jenkins_ynh | Continuous Integration platform |
+| [Z-Push](https://z-push.org/) | beudbeud | <div class="ready"/> | https://github.com/abeudin/z-push_ynh | ActiveSync Server |
 
 
 ### Wishlist
diff --git a/apps_fr.md b/apps_fr.md
index 5611c249..107765eb 100644
--- a/apps_fr.md
+++ b/apps_fr.md
@@ -14,7 +14,7 @@
         <p><strong>Description</strong>: {app_description}</p>
         <p><strong>Dernière mise à jour (UTC)</strong>: {app_update}</p>
         <p><strong>Mainteneur</strong>: {app_maintainer} <small class="text-muted">({app_mail})</small></p>
-        <p><strong>Git</strong>: {app_git} <small class="text-muted">({app_branch})</small></p>
+        <p><strong>Git</strong>: <a href="{app_git}" target="_blank">{app_git}</a> <small class="text-muted">({app_branch})</small></p>
         <a href="#/app_{app_id}_fr" target="_blank" class="btn btn-default">Documentation</a>
     </div>
   </div>
@@ -54,11 +54,22 @@ $(document).ready(function () {
              .replace(/{app_id}/g, app_id)
              .replace(/{app_name}/g, infos.manifest.name)
              .replace('{app_description}', infos.manifest.description.fr)
-             .replace('{app_maintainer}', infos.manifest.developer.name)
-             .replace('{app_mail}', infos.manifest.developer.email)
-             .replace('{app_git}', infos.git.url)
+             .replace(/{app_git}/g, infos.git.url)
              .replace('{app_branch}', infos.git.branch)
              .replace('{app_update}', timeConverter(infos.lastUpdate));
+
+      if (infos.manifest.developer) {
+        html = html
+          .replace('{app_maintainer}', infos.manifest.developer.name)
+          .replace('{app_mail}', infos.manifest.developer.email);
+      }
+
+      if (infos.manifest.maintainer) {
+        html = html
+          .replace('{app_maintainer}', infos.manifest.maintainer.name)
+          .replace('{app_mail}', infos.manifest.maintainer.email);
+      }
+
       $('#app-accordion').append(html);
       $('.app_'+ app_id).attr('id', 'app_'+ app_id);
     });
diff --git a/appsdev_fr.md b/appsdev_fr.md
index 97e07a7c..f292e55d 100644
--- a/appsdev_fr.md
+++ b/appsdev_fr.md
@@ -1,5 +1,67 @@
 #Apps Work in progress
 
+<script>
+
+function timeConverter(UNIX_timestamp) {
+    var a = new Date(UNIX_timestamp*1000);
+    var months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
+    var year = a.getFullYear();
+    var month = months[a.getMonth()];
+    var date = a.getDate();
+    var hour = a.getHours();
+    var min = a.getMinutes();
+    if (hour < 10) { hour = '0' + hour; }
+    if (min < 10) { min = '0' + min; }
+    var time = date+' '+month+' '+year+' at '+hour+':'+min;
+    return time;
+}
+
+$(document).ready(function () {
+  $.getJSON('/list.json', function(app_list) {
+    // Cast as array
+    var app_list = $.map(app_list, function(el) { return el; });
+    // Sort alpha
+    app_list.sort(function(a, b){
+      if (a.manifest.id > b.manifest.id) {return 1;}
+      else if (a.manifest.id < b.manifest.id) {return -1;}
+      return 0;
+    });
+    $.each(app_list, function(k, infos) {
+      app_id = infos.manifest.id;
+      html = $('#app-template').html()
+             .replace(/{app_id}/g, app_id)
+             .replace(/{app_name}/g, infos.manifest.name)
+             .replace('{app_description}', infos.manifest.description.en)
+             .replace('{app_git}', infos.git.url)
+             .replace('{app_branch}', infos.git.branch)
+             .replace('{app_update}', timeConverter(infos.lastUpdate));
+
+      if (infos.manifest.developer) {
+        html = html
+          .replace('{app_maintainer}', infos.manifest.developer.name)
+          .replace('{app_mail}', infos.manifest.developer.email);
+      }
+      else {
+        html = html
+          .replace('{app_maintainer}', 'unknown')
+          .replace('{app_mail}', 'unknown');
+      }
+
+      $('#app-accordion').append(html);
+      $('.app_'+ app_id).attr('id', 'app_'+ app_id);
+    });
+  });
+
+  $(".inprogress").each(function() {
+    $(this).html( '<a class="btn btn-small btn-warning disabled" href="#">in progress</a>' );
+  });
+  $(".ready").each(function() {
+    $(this).html( '<a class="btn btn-small btn-success disabled" href="#">ready</a>' );
+  });
+
+});
+</script>
+
 The following applications are being worked on by a growing number of packagers.
 
 They are <strong>NOT</strong> validated by the packaging team, and as such, no official support is provided for them.
@@ -115,21 +177,3 @@ The following list is a compiled wishlist of applications that would be nice-to-
 * [racktables](http://racktables.org/)
 * [Known](https://withknown.com/)
 * [Mopidy](https://www.mopidy.com/)
-
-<script type="text/javascript" src="_js/jquery.tablesorter.js"></script>
-<script type='text/javascript'>
-
-$(function() {
-
-  // initial sort set using sortList option
-  $(".table").tablesorter({
-    theme : 'bootstrap',
-    headerTemplate : '{content} {icon}',
-    sortAsc    : 'icon-chevron-up glyphicon glyphicon-chevron-up',
-    sortDesc   : 'icon-chevron-down glyphicon glyphicon-chevron-down', 
-    // sort on the first column and second column in ascending order
-    sortList: [[0,0],[2,0]]
-    });
-});
-
-</script>