Merge branch 'unstable' of https://github.com/Z3Prover/z3 into minimum

Signed-off-by: Alex Horn <t-alexh@microsoft.com>

Conflicts:
	src/test/dl_table.cpp

src/muz/base/dl_boogie_proof.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 /**
 
 Example from Boogie:

src/muz/base/dl_boogie_proof.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 /**
 
 output     :: derivation model

src/muz/base/hnf.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 /*--
  Module Name:
  

src/muz/base/proof_utils.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "dl_util.h"
 #include "proof_utils.h"
 #include "ast_smt2_pp.h"

src/muz/fp/datalog_parser.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #include"datalog_parser.h"
 #include"string_buffer.h"
 #include"str_hashtable.h"

src/muz/rel/check_relation.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "check_relation.h"
 #include "dl_relation_manager.h"
 #include "qe_util.h"

src/muz/rel/karr_relation.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "karr_relation.h"
 #include "bool_rewriter.h"