Conflicts:
	library/LibUtilities/BasicUtils/ErrorUtil.hpp
	library/LibUtilities/Communication/Transposition.cpp
	library/LocalRegions/Expansion3D.cpp
	library/LocalRegions/HexExp.cpp
	library/LocalRegions/HexExp.h
	library/LocalRegions/SegExp.cpp
	library/LocalRegions/SegExp.h
	library/MultiRegions/ExpList.cpp
	library/MultiRegions/ExpListHomogeneous1D.cpp
	library/MultiRegions/PreconditionerDiagonal.cpp
	library/SpatialDomains/Geometry.h
	library/SpatialDomains/Geometry3D.cpp
	library/SpatialDomains/SegGeom.cpp
	library/StdRegions/StdHexExp.cpp
	library/StdRegions/StdHexExp.h
	library/StdRegions/StdPyrExp.cpp
	library/StdRegions/StdSegExp.cpp
	library/StdRegions/StdSegExp.h