little modifications
Merge branch 'master' of github.com:yade/trunk
Correct a remaining bug into the toSimulation() python function.
Fix the computation of viscous forces by using the correct positions of bodies (updated in buildTriangulation), and fix some variable names.
- fix https://bugs.launchpad.net/yade/+bug/923929 again, as shown by François it could still happen in some cases (see example in the bug report)
Merge remote branch 'origin'

Conflicts:
	py/pack/pack.py
Merge branch 'master' of github.com:yade/trunk
- remove the check/throw when generating aperiodic 2D packings, since the algorithm actually support that.
added example script for CombinedKinematicEngine
Merge remote branch 'origin/master'
Merge branch 'master' of github.com:yade/trunk
Merge branch 'master' of github.com:yade/trunk
Merge branch 'master' of github.com:yade/trunk
Merge branch 'master' of github.com:yade/trunk
Merge branch 'master' of github.com:yade/trunk
Merge branch 'master' of github.com:yade/trunk
Merge branch 'master' of github.com:yade/trunk
Merge branch 'master' of github.com:yade/trunk