Nouvelle police Ubuntu google font bis
Merge branch 'master' into gh-pages

Conflicts:
	_layouts/simple.html
	_layouts/training.html