Resolved CI files to master, all other files to new-master

Conflicts:
	.gitsuper
	.travis.test_python.bash
	.travis.yml
	dune/xt/functions/interfaces/local-functions.hh
	dune/xt/functions/spe10/model1.hh
	dune/xt/functions/spe10/model2.hh
	dune/xt/functions/test/CMakeLists.txt
	dune/xt/functions/test/affine.cc
	dune/xt/functions/test/affine_flux.cc
	dune/xt/functions/test/builder_definitions.cmake
	dune/xt/functions/test/compiles_totals.pickle
	dune/xt/functions/test/testruns_totals.pickle
	python/dune/xt/bindings.cc