Merge trunk into branch_port_the_testsuite

Conflicts:
	tests/deal.II/grid_tools_05.output
	tests/deal.II/grid_tools_05/cmp/generic

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31111 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/CMakeLists.txt
Simple merge

diff --cc deal.II/cmake/setup_compiler_flags_intel.cmake
Simple merge

diff --cc deal.II/cmake/setup_finalize.cmake
Simple merge