Conflicts:
	cmake/Nektar++Config.cmake.in
	library/LocalRegions/PrismExp.cpp
	library/SpatialDomains/MeshGraph.cpp
	library/StdRegions/StdExpansion.h
	library/StdRegions/StdExpansion3D.cpp
	library/StdRegions/StdPrismExp.cpp
	library/StdRegions/StdQuadExp.cpp
	library/StdRegions/StdQuadExp.h
	library/StdRegions/StdTetExp.cpp
	library/StdRegions/StdTriExp.cpp