no message
Merge branch 'master' of https://github.com/martial/mira
no message
Merge branch 'master' of https://github.com/martial/mira

Conflicts:
	AnimationsManager.pde
Merge branch 'master' of https://github.com/martial/mira