Merge origin/master

Conflicts:
	bootstrap-3.2.0-dist/gestionMots.html
Merge origin/master

Conflicts:
	bootstrap-3.2.0-dist/gestionMots.html
Merge origin/master

Conflicts:
	bootstrap-3.2.0-dist/gestionMots.html