Collide Curves Added
Merge branch 'develop' of https://github.com/brandoncc94/tennisDesigner into develop

Conflicts:
	js/main/Presentation/View/designSpaceUI.js