Collisions with line

implemented, not enabled
Merge branch 'master' of https://github.com/ArjanBroos/SnCG1

Conflicts:
	LineConstraint.cpp