Merge branch 'issue_282_configcontainer' of https://github.com/wwu-numerik/dune-stuff
[test] replace main function in tests by test_main include in test_common
[test.common_logger] move test from main function to TEST
[test.common_configuration] remove const-qualifiers to fix icc/boost bug
[test.common_configuration] remove const-qualifiers to fix icc/boost bug
Merge branch 'master' of https://github.com/tobiasleibner/DUNE-Stuff

Conflicts:
	dune/stuff/test/common_configuration.cc
Merge branch 'master' of https://github.com/wwu-numerik/dune-stuff

Conflicts:
	dune/stuff/test/common_color.cc
	dune/stuff/test/common_configuration.cc
	dune/stuff/test/common_fixed_map.cc
	dune/stuff/test/common_math.cc
	dune/stuff/test/common_profiler.cc
	dune/stuff/test/common_ranges.cc
	dune/stuff/test/common_string.cc
	dune/stuff/test/common_tuple.cc
	dune/stuff/test/common_typenames.cc
	dune/stuff/test/common_validation.cc
	dune/stuff/test/fem_error.cc
	dune/stuff/test/functions_checkerboard.cc
	dune/stuff/test/functions_constant.cc
	dune/stuff/test/functions_expression.cc
	dune/stuff/test/functions_functions.cc
	dune/stuff/test/functions_global.cc
	dune/stuff/test/grid_information.cc
	dune/stuff/test/grid_output_pgf.cc
	dune/stuff/test/grid_provider.cc
	dune/stuff/test/la_container.cc
	dune/stuff/test/la_solver.cc
[test.common_logger] include main
[test.test_common] remove include
[test.common_string] disable test for intel compiler
[test.common_configuration] remove const to workaround icc/boost bug
Merge remote-tracking branch 'tobias/master'

Conflicts:
	dune/stuff/test/common_logger.cc