BUGFIX: removed circular dependency
Merge commit 'ae82824' into upgrade_refinement_criteria

Conflicts:
	src/grid/refinement.F90