Added sphere struct. And fixed placeholderblachole
merge conflicts fixes

Conflicts:
	BO360/BO360/BOBlackHole.cpp
	BO360/BO360/BOObject.cpp
Merge branch 'master' of https://github.com/BTHAgileProject2014/BO360