Merge branch 'refs/heads/wdas-master'

Conflicts fixed
	.gitignore
	src/lib/core/ParticleHeaders.cpp
	src/lib/io/BIN.cpp
	src/lib/io/GEO.cpp
	src/lib/io/MC.cpp
	src/lib/io/PDC.cpp
	src/lib/io/PRT.cpp
	src/lib/io/ParticleIO.cpp
	src/lib/io/RIB.cpp
	src/lib/io/pdb.h
	src/lib/io/readers.h
	src/tools/partattr.cpp
	src/tools/partview.cpp
Merge branch 'refs/heads/master' into redpawfx

Conflicts resolved
	.gitignore
	src/lib/io/BIN.cpp
	src/lib/io/PDC.cpp
	src/lib/io/PRT.cpp
	src/lib/io/ParticleIO.cpp
	src/lib/io/readers.h