Merge branch 'master' into features

# Conflicts:
#	src/app/modules/users/pages/add/add.component.html
#	src/app/modules/users/pages/edit/edit.component.html
#	src/app/modules/users/pages/password-edit/password-edit.component.html

src/app/modules/users/pages/add/add.component.html

@@ -1,6 +1,6 @@
 <cre-entity-add
   title="Création d'un utilisateur"
-  backButtonLink="/user/list"
+  backButtonLink="/admin/user/list"
   [formFields]="formFields"
   (submit)="submit($event)">
 </cre-entity-add>

src/app/modules/users/pages/edit/edit.component.html

@@ -1,7 +1,7 @@
 <cre-entity-edit
   *ngIf="user"
   title="Modification de l'utilisateur #{{user.id}}"
-  backButtonLink="/user/list"
+  backButtonLink="/admin/user/list"
   deletePermission="REMOVE_USERS"
   deleteConfirmMessage="Voulez-vous vraiment supprimer l'utilisateur #{{user.id}}?"
   [entity]="user"

src/app/modules/users/pages/password-edit/password-edit.component.html

@@ -15,7 +15,7 @@
       </mat-form-field>
     </mat-card-content>
     <mat-card-actions>
-      <button mat-raised-button color="primary" routerLink="/user/list">Retour</button>
+      <button mat-raised-button color="primary" routerLink="/admin/user/list">Retour</button>
       <button mat-raised-button color="accent" [disabled]="form.invalid" (click)="submit()">Enregistrer</button>
     </mat-card-actions>
   </form>