Fix Makefile
Add desc.collision
Change copyright
Add desc.core
add desc.geometry
Add desc.graphic
Add desc.knobycreator
Add desc.material
Change config to switch to Sphinx 1.2
Add special and private members
Add desc.merge
Update desc.merge
Fix Makefile