no message
Merge branch 'master' of https://github.com/guiherzog/curveAnimation

Conflicts:
	build-tmp/source/curveAnimation.java
	src/EditingState.pde