Conflicts:
	solvers/IncNavierStokesSolver/EquationSystems/IncNavierStokes.cpp

Conflicts:
	library/LocalRegions/QuadExp.cpp
	library/LocalRegions/QuadExp.h
	library/LocalRegions/SegExp.cpp
	library/LocalRegions/TetExp.cpp
	library/LocalRegions/TriExp.cpp
	library/LocalRegions/TriExp.h
	library/MultiRegions/AssemblyMap/AssemblyMapCG.h
	library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp
	library/MultiRegions/AssemblyMap/AssemblyMapCG3D.h
	library/MultiRegions/ContField3D.cpp
	library/MultiRegions/DisContField1D.cpp
	library/MultiRegions/DisContField2D.cpp
	library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp
	library/SolverUtils/Advection/AdvectionFR.cpp
	library/SolverUtils/EquationSystem.cpp
	library/SpatialDomains/PrismGeom.cpp
	library/SpatialDomains/PrismGeom.h
	library/StdRegions/StdExpansion.cpp
	library/StdRegions/StdExpansion.h
	library/StdRegions/StdTetExp.cpp
	solvers/IncNavierStokesSolver/EquationSystems/IncNavierStokes.cpp