Conflicts:
	library/MultiRegions/DisContField3DHomogeneous1D.cpp
	library/MultiRegions/ExpList.h
	library/MultiRegions/ExpList1D.h
	library/MultiRegions/ExpList2D.h
	library/MultiRegions/ExpList2DHomogeneous1D.cpp
	library/MultiRegions/ExpList2DHomogeneous1D.h
	library/SolverUtils/Advection/AdvectionFR.cpp
	solvers/CompressibleFlowSolver/CMakeLists.txt
	solvers/CompressibleFlowSolver/EquationSystems/CompressibleFlowSystem.cpp
	solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LDG_GAUSS.tst
	solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GAUSS.tst
	solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_GAUSS.tst
	solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_MODIFIED.tst