Merge branch '1.0.x'

Conflicts:
	src/theory/quantifiers/theory_quantifiers.cpp

diff --cc src/expr/expr_template.h
Simple merge

diff --cc src/smt/smt_engine.cpp
Simple merge

diff --cc test/regress/regress0/Makefile.am
Simple merge