Merge branch 'develop' into Rookies

Conflicts:
	apps/maarch_entreprise/js/angular/app/app.module.js
	apps/maarch_entreprise/js/angular/app/app.module.ts
	apps/maarch_entreprise/js/angular/main.bundle.min.js
	apps/maarch_entreprise/js/functions.js
	apps/maarch_entreprise/lang/en.php
	apps/maarch_entreprise/lang/fr.php
	apps/maarch_entreprise/merged_jsAbstract.php
	core/Models/StatusModelAbstract.php
	modules/basket/js/functions.js
	sonar-project.properties
	sql/17_xx.sql