små fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	BO360/BO360/BOObjectManager.cpp