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/app/profile.component.js
	apps/maarch_entreprise/js/angular/app/profile.component.ts
	apps/maarch_entreprise/js/angular/main.bundle.min.js
	apps/maarch_entreprise/lang/en.php
	apps/maarch_entreprise/merged_css.php
	apps/maarch_entreprise/merged_jsAbstract.php
	core/Models/LangModelAbstract.php
	modules/basket/Models/BasketsModelAbstract.php