Merge branch 'master' into parallel2d

and resolved the following
Conflicts:
	configure.ac
	dune/alugrid/3d/datahandle.hh
	dune/alugrid/3d/grid_imp.cc
	dune/alugrid/3d/grid_inline.hh
	dune/alugrid/3d/gridfactory.hh
	dune/alugrid/test/test-alugrid.cc
	lib/Makefile.am