Merge branch 'master' into patrick_master_integration

Conflicts:
	dune/multiscale/common/error_calc.cc
	dune/multiscale/lod/lod_solver.cc
	dune/multiscale/lod/lod_solver.hh
	dune/multiscale/msfem/fem_solver.cc
	dune/multiscale/msfem/fem_solver.hh
	dune/multiscale/msfem/localproblems/localproblemsolver.cc
	dune/multiscale/msfem/localproblems/localproblemsolver.hh
	dune/multiscale/problems/elliptic/nine.cc
	dune/multiscale/problems/elliptic/thirteen.cc
	dune/multiscale/problems/elliptic/thirteen.hh
	dune/multiscale/problems/elliptic/twelve.cc
	dune/multiscale/problems/selector.cc
	src/Makefile.am
some refixing after merge