[Maj]
Merge branch 'master' of https://github.com/thibaud8/agora-v3

Conflicts:
	Plugins/Augustus (plug-in).zip