Minor change
Merge branch 'master' of https://github.com/FeiZhu/Physika
Clear interfaces of CollisionPair and add collide interfaces in CollidableObject
Merge branch 'master' of https://github.com/FeiZhu/Physika

Conflicts:
	Physika_Src/Physika_GUI/Glut_Window/glut_window.cpp