Merge branch 'master' into ecb-master

Fixed conflicts:
	doc/userguide/models/fs2000ns_steadystate.m
	doc/userguide/models/fsdat.m
	matlab/modules/dseries
	mex/sources/estimation/tests/logposterior_dll_test/random_walk_metropolis_hastings_core.m
	mex/sources/estimation/tests/logposterior_dll_test/rawdata_euromodel_1.m
	mex/sources/estimation/tests/random_walk_metropolis_hastings_core.m
	mex/sources/estimation/tests/rawdata_euromodel_1.m

ComputingTasks.cc

@@ -1291,8 +1291,7 @@ EstimatedParamsStatement::checkPass(ModFileStructure &mod_file_struct, WarningCo
 void
 EstimatedParamsStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
 {
-  output << "global estim_params_" << endl
-         << "estim_params_.var_exo = [];" << endl
+  output << "estim_params_.var_exo = [];" << endl
          << "estim_params_.var_endo = [];" << endl
          << "estim_params_.corrx = [];" << endl
          << "estim_params_.corrn = [];" << endl

ExprNode.cc

@@ -3511,6 +3511,16 @@ BinaryOpNode::writeJsonOutput(ostream &output,
       return;
     }
 
+  if (op_code == oPowerDeriv)
+    {
+      output << "get_power_deriv(";
+      arg1->writeJsonOutput(output, temporary_terms, tef_terms);
+      output << ",";
+      arg2->writeJsonOutput(output, temporary_terms, tef_terms);
+      output << "," << powerDerivOrder << ")";
+      return;
+    }
+
   int prec = precedenceJson(temporary_terms);
 
   bool close_parenthesis = false;

SymbolTable.cc

@@ -110,7 +110,7 @@ SymbolTable::freeze() throw (FrozenException)
 
   frozen = true;
 
-  for (int i = 0; i < symbol_table.size(); i++)
+  for (int i = 0; i < (int) symbol_table.size(); i++)
     {
       int tsi;
       switch (getType(i))

SymbolTable.hh

@@ -384,7 +384,7 @@ public:
 inline void
 SymbolTable::validateSymbID(int symb_id) const throw (UnknownSymbolIDException)
 {
-  if (symb_id < 0 || symb_id > symbol_table.size())
+  if (symb_id < 0 || symb_id > (int) symbol_table.size())
     throw UnknownSymbolIDException(symb_id);
 }
 

changed_files.txt

@@ -1,4 +0,0 @@
-
-license.txt
-
-windows/dynare.nsi