bra
Merge branch 'master' of https://github.com/VincentRicard/nuitdelinfo

Conflicts:
	dev/css/style_common.less
	dev/index.html
Merge branch 'master' of https://github.com/VincentRicard/nuitdelinfo

Conflicts:
	dev/css/style_common.less