Conflicts:
	examples/heatTransfer/IO_adios2.cpp
	examples/hello/bpWriter/helloBPWriter.cpp
	examples/hello/bpWriter/helloBPWriter_nompi.cpp
	include/ADIOS.h
	include/capsule/heap/STLVector.h
	include/core/Capsule.h
	include/core/Engine.h
	include/core/Method.h
	include/core/Profiler.h
	include/core/Transport.h
	include/engine/bp/BPFileReader.h
	include/engine/bp/BPFileWriter.h
	include/engine/dataman/DataManReader.h
	include/engine/dataman/DataManWriter.h
	include/format/BP1.h
	include/format/BP1Aggregator.h
	include/format/BP1Writer.h
	source/ADIOS.cpp
	source/core/Engine.cpp
	source/core/Method.cpp
	source/core/Transport.cpp
	source/engine/bp/BPFileWriter.cpp
	source/format/BP1.cpp
	source/format/BP1Aggregator.cpp
	source/format/BP1Writer.cpp
	source/transport/file/FileDescriptor.cpp