petit carrousel annonce oklm
Merge branch 'master2' of https://github.com/stephanedhml/APP-Welchome into master2

Conflicts:
	.idea/workspace.xml