Revert "revert to fix visualization bugs and clean up some rubbish"

This reverts commit dfa19b1d69c321c6a27f02308eb346e45b20b13a.
Merge remote-tracking branch 'origin/master'

Conflicts:
	PBF_Stage2/Ref/PROJ_WIN/Project3/shaders/planetGS.glsl
	PBF_Stage2/Ref/src/Macros.h
	PBF_Stage2/Ref/src/kernel.cu
	PBF_Stage2/Ref/src/main.cpp