Merge branch 'master' of https://github.com/bertrandgressier/dlplateform

Conflicts:
	app/scripts/filters/bytesToMo.js