Merging in a fix from 1.3.x.
Fixes an idempotency issue for non-linear multiplication with integer and real variables.

Conflicts:
	src/theory/arith/normal_form.cpp
adds intersection
deriv symbolic regexp
Merge branch 'master' of github.com:tiliang/CVC4