Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

apps/maarch_entreprise/css/bootstrap.min.css

apps/maarch_entreprise/js/Chart.min.js

apps/maarch_entreprise/js/angular/app/profile.component.js

apps/maarch_entreprise/js/angular/app/profile.component.ts

...rch_entreprise/js/angular/app/signature-book.component.js

...rch_entreprise/js/angular/app/signature-book.component.ts

apps/maarch_entreprise/js/angular/main.bundle.min.js

apps/maarch_entreprise/js/functions.js

apps/maarch_entreprise/js/jquery.min.js

apps/maarch_entreprise/js/jquery.nicescroll.min.js

apps/maarch_entreprise/merged_css.php

apps/maarch_entreprise/merged_jsAbstract.php

apps/maarch_entreprise/tools/tiny_mce/langs/en_GB.js

apps/maarch_entreprise/tools/tiny_mce/langs/readme.md

apps/maarch_entreprise/tools/tiny_mce/license.txt

...h_entreprise/tools/tiny_mce/plugins/advlist/plugin.min.js

...ch_entreprise/tools/tiny_mce/plugins/anchor/plugin.min.js

..._entreprise/tools/tiny_mce/plugins/autolink/plugin.min.js

...ntreprise/tools/tiny_mce/plugins/autoresize/plugin.min.js

..._entreprise/tools/tiny_mce/plugins/autosave/plugin.min.js