test
Merge branch 'dev' of github.com:jeremypetrequin/jsMovieclip into dev

Conflicts:
	tools/timeline/jsmovieclip.timeline-0.1.js