...
Merge branch 'eigen_solver_refactor' into falk

Conflicts:
	dune/stuff/fem/matrix_object.hh
Merge branch 'falk' of http://users.dune-project.org/repositories/projects/dune-stuff into falk

Conflicts:
	dune/stuff/fem/matrix_object.hh