fix: [changelog] updated

Changelog.txt

@@ -2,7 +2,7 @@ Changelog
 =========
 
 
-v2.4.95 (2018-09-05)
+v2.4.95 (2018-09-06)
 --------------------
 
 New
@@ -120,6 +120,9 @@ New
 
 Changes
 ~~~~~~~
+- [doc] Point to official misp-book, MISP "User Guide" in main codebase
+  is obsolete. [Steve Clement]
+- [PyMISP] updated to the latest version. [Alexandre Dulaunoy]
 - [version] Bump. [iglocska]
 - [bug] Fixed wrong event lookup in case the uuid is passed as an
   eventId. Previously the code had two mutually exclusive conditions
@@ -206,6 +209,7 @@ Changes
 
 Fix
 ~~~
+- [documentation] added missing legacy automation page view. [iglocska]
 - [description] Typo in serverSetting fixed, fixes #3612. [iglocska]
 - [API] using "download" as a returnformat via the URL breaks the
   restSearch API. [iglocska]
@@ -370,6 +374,16 @@ Fix
 
 Other
 ~~~~~
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [chrisr3d]
+- Temporary revert to avoid PGP bug. [Sami Mokaddem]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [Alexandre
+  Dulaunoy]
+- Merge pull request #3623 from SteveClement/guides. [Andras Iklody]
+
+  chg: [doc] Guides in the main code base are obosolete
+- Merge remote-tracking branch 'upstream/2.4' into guides. [Steve
+  Clement]
+- Merge branch '2.4' into guides. [Steve Clement]
 - Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
 - Merge pull request #3530 from chkp-aliaksandrt/fix-object-add-if-uuid-
   is-passed-as-eventid. [Andras Iklody]
@@ -396,6 +410,8 @@ Other
   Vaccaro]
 - Merge branch '2.4' of github.com:MISP/MISP into 2.4. [Alexandre
   Dulaunoy]
+- Add: [stix1 import] Added STIX 1 object type to the mapping types.
+  [chrisr3d]
 - Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
 - Merge pull request #3610 from RichieB2B/patch-3. [Andras Iklody]