Only small changes. Just committed them to allow a pull.
Merge branch 'master' of http://users.dune-project.org/repositories/projects/dune-multiscale