Merge branch '3.0-unstable-dev' of https://github.com/olivierb2/igestis into 3.0-unstable-dev

Conflicts:
	.gitignore