Merge commit 'c6280ab0' into fix/PulseWave

Conflicts:
	library/LocalRegions/PointExp.h
	library/MultiRegions/AssemblyMap/AssemblyMapCG1D.cpp
	library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
	library/MultiRegions/DisContField1D.cpp
	library/MultiRegions/ExpList.cpp
	library/MultiRegions/ExpList.h
	library/MultiRegions/ExpList0D.cpp
	library/MultiRegions/ExpList0D.h
	library/SpatialDomains/Geometry.cpp
	library/SpatialDomains/Geometry.h
	library/SpatialDomains/Geometry1D.cpp
	library/SpatialDomains/Geometry1D.h
	library/SpatialDomains/MeshComponents.cpp
	library/SpatialDomains/MeshComponents.h
	library/SpatialDomains/MeshGraph.cpp
	library/SpatialDomains/PointGeom.cpp
	library/SpatialDomains/PointGeom.h
	library/SpatialDomains/SegGeom.cpp
	library/SpatialDomains/SegGeom.h