Conflicts:
	library/LocalRegions/Expansion.cpp
	library/LocalRegions/Expansion.h
	library/LocalRegions/HexExp.cpp
	library/LocalRegions/HexExp.h
	library/LocalRegions/PrismExp.cpp
	library/LocalRegions/QuadExp.cpp
	library/LocalRegions/QuadExp.h
	library/LocalRegions/SegExp.h
	library/LocalRegions/TetExp.cpp
	library/LocalRegions/TriExp.cpp
	library/MultiRegions/AssemblyMap/AssemblyMapCG.cpp
	library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp
	library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
	library/MultiRegions/CMakeLists.txt
	library/MultiRegions/DisContField1D.cpp
	library/MultiRegions/DisContField2D.cpp
	library/MultiRegions/DisContField3D.cpp
	library/MultiRegions/ExpList.cpp
	library/MultiRegions/ExpListHomogeneous1D.cpp
	library/SolverUtils/Advection/AdvectionFR.cpp
	library/SpatialDomains/GeomFactors2D.cpp
	library/SpatialDomains/GeomFactors2D.h
	library/SpatialDomains/GeomFactors3D.cpp
	library/SpatialDomains/GeomFactors3D.h
	library/SpatialDomains/Geometry.cpp
	library/SpatialDomains/Geometry.h
	solvers/CardiacEPSolver/Utilities/FibreToNektar/FibreToNektar.cpp
	solvers/IncNavierStokesSolver/EquationSystems/IncNavierStokes.cpp