Merge pull request #61 from dartsim/primitive_collision

Primitive collision
Fix bug in use of lcp solver.
Add setTimeStep and getTimeStep functions into ConstraintDynamics class.
Merge branch 'origin/master'

Conflicts:
	src/dynamics/ContactDynamics.cpp