Minor
Merge branch 'master' of https://github.com/EsupPortail/esup-catapp-srv

Conflicts:
	.gitignore