Merge origin/gael into gael

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
clean de form abstract