Merge branch 'develop'v2.4

122 files changed, 5802 insertions, 4218 deletions

diff --git a/AUTHORS b/AUTHORS
index 528226a5..30859b6e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,25 +5,34 @@ Developers
 Nicolas Hennion (aka) Nicolargo
 http://blog.nicolargo.com
 https://twitter.com/nicolargo
+https://github.com/nicolargo
 nicolashennion@gmail.com
 PGP Fingerprint: 835F C447 3BCD 60E9 9200  2778 ABA4 D1AB 9731 6A3C
 PGP Public key:  gpg --keyserver pgp.mit.edu --recv-keys 0xaba4d1ab97316a3c 
 
-Alessio Sergi (aka) al3hex
+Alessio Sergi (aka) Al3hex
 https://twitter.com/al3hex
+https://github.com/asergi
 
 Brandon Philips (aka) Philips
 http://ifup.org/
+https://github.com/philips
 
 Jon Renner (aka) Jrenner
 https://github.com/jrenner
 
-Maxime Desbrus (aka) desbma
+Maxime Desbrus (aka) Desbma
 https://github.com/desbma
 
-Nicolas Hart (aka) NclsHart for the UI design
+Nicolas Hart (aka) NclsHart (for the Web user interface)
 https://github.com/nclsHart
 
+Sylvain Mouquet (aka) SylvainMouquet (for the Web user interface)
+http://github.com/sylvainmouquet
+
+Floran Brutel (aka) notFloran (for the Web user interface)
+https://github.com/notFloran
+
 =========
 Packagers
 =========
diff --git a/MANIFEST.in b/MANIFEST.in
index 98cb6021..37000d2a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,11 +3,16 @@ include COPYING
 include NEWS
 include README.rst
 include conf/glances.conf
-include glances/outputs/bottle/*.tpl
+include glances/outputs/static/html/*.html
+include glances/outputs/static/html/components/*.html
+include glances/outputs/static/html/plugins/*.html
 include glances/outputs/static/*.ico
 include glances/outputs/static/css/*.css
 include glances/outputs/static/js/*.js
+include glances/outputs/static/js/*.js.map
+include glances/outputs/static/js/vendors/*.js
+include glances/outputs/static/js/vendors/*.js.map
+include glances/outputs/static/images/*.png
 include man/glances.1
 recursive-include docs images/*.png glances-doc.html
 recursive-include glances *.py
-recursive-include i18n *.mo
diff --git a/NEWS b/NEWS
index 4b4419ef..f31ad161 100644
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,47 @@
 Glances Version 2.x
 ==============================================================================
 
+Version 2.4
+===========
+
+Changes:
+
+    * Glances doesn't provide a system-wide configuration file by default anymore.
+      Just copy it in any of the supported locations. See glances-doc.html for
+      more information. (issue #541)
+    * The default key bindings have been changed to:
+      - 'u': sort processes by USER
+      - 'U': show cumulative network I/O
+    * No more translations
+
+Enhancements and new features:
+
+    * The Web user interface is now based on AngularJS (issue #473, #508, #468)
+    * Implement a 'quick look' plugin (issue #505)
+    * Add sort processes by USER (issue #531)
+    * Add a new IP information plugin (issue #509)
+    * Add RabbitMQ export module (issue #540 Thk to @Katyucha)
+    * Add a quiet mode (-q), can be useful using with export module
+    * Grab FAN speed in the Glances sensors plugin (issue #501)
+    * Allow logical mounts points in the FS plugin (issue #448)
+    * Add a --disable-hddtemp to disable HDD temperature module at startup (issue #515)
+    * Increase alert minimal delay to 6 seconds (issue #522) 
+    * If the Curses application raises an exception, restore the terminal correctly (issue #537)
+
+Bugs corrected:
+
+    * Monitor list, all processes are take into account (issue #507)
+    * Duplicated