use $MATHEMATICA_HOME to find Mathematica headers
Merge branch 'master' into mac

Conflicts:
	.cproject
	Debug/subdir.mk
	Release/subdir.mk
	asan/subdir.mk