Merged with develop

Author: andlessa

ReleaseNotes

@@ -1,7 +1,7 @@
-Release v1.2.2, Tue 27 Nov 2018
+Release v1.2.2, Tue 28 Nov 2018
 =======================================================
 
-  * Updated database, added T3GQ eff maps and a few ATLAS 13 TeV results
+  * Updated database, added T3GQ eff maps for 8TeV and a few ATLAS 13 TeV results
   * Database "official" now refers to a database without fastlim results, "official_fastlim", to the official database *with* fastlim
   * List displaced signatures in missing topologies
   * Small improvements in documentation

smodels/README.rst

@@ -49,20 +49,20 @@ used to test *runSModelS.py*.
 Citation
 ========
 
-If you use this software please cite both the SModelS v11_ and v12_ manuals, 
+If you use this software please cite both the SModelS v1.1_ and v1.2_ manuals, 
 the original_ SModelS publication, as well as the programs
 it makes use of (pythia8_/pythia6_, NLL-fast_ and pyslha_). 
 If you use specifically the long-lived particles implementation, please cite also this_ paper.
-For the Run2 database, cite the v12_ manual and the databaseUpdate_ paper.
+For the Run2 database, cite the v1.2_ manual and the databaseUpdate_ paper.
 
 For your convenience, the relevant
 citations are provided in bibtex format in *references.bib*.
 
 For citing the experimental analyses in the database, you can use
 *smodels-database/database.bib*.
 
-.. _v12: https://inspirehep.net/record/1705426
-.. _v11: https://inspirehep.net/record/1510436
+.. _v1.2: https://inspirehep.net/record/1705426
+.. _v1.1: https://inspirehep.net/record/1510436
 .. _original: https://inspirehep.net/record/1269436
 .. _this: https://inspirehep.net/record/1687820
 .. _databaseUpdate: https://inspirehep.net/record/1658765