Fixes for subdomains.

Conflicts:
	hermes2d/src/discrete_problem.cpp