Merge remote-tracking branch 'remotes/origin/dev' # Conflicts: # src/main/java/fr/utc/onzzer/client/GlobalController.java # src/main/java/fr/utc/onzzer/client/common/communication/ClientCommunicationController.java # src/main/java/fr/utc/onzzer/client/common/services/ComServicesProvider.java # src/main/java/fr/utc/onzzer/client/common/services/DataCommentServices.java # src/main/java/fr/utc/onzzer/client/common/services/DataRatingServices.java # src/main/java/fr/utc/onzzer/client/common/services/DataUserServices.java # src/main/java/fr/utc/onzzer/client/common/services/EVENTS.java # src/main/java/fr/utc/onzzer/client/common/services/Event.java # src/main/java/fr/utc/onzzer/client/component/IconButton.java # src/main/java/fr/utc/onzzer/client/data/DataServicesProvider.java # src/main/java/fr/utc/onzzer/client/data/impl/DataCommentServicesImpl.java # src/main/java/fr/utc/onzzer/client/data/impl/DataRatingServicesImpl.java # src/main/java/fr/utc/onzzer/client/data/impl/DataRepository.java # src/main/java/fr/utc/onzzer/client/data/impl/DataTrackServicesImpl.java # src/main/java/fr/utc/onzzer/client/data/impl/DataUserServicesImpl.java # src/main/java/fr/utc/onzzer/client/main/IHMMainServices.java # src/main/java/fr/utc/onzzer/client/main/LoginViewController.java # src/main/java/fr/utc/onzzer/client/main/MyTrackController.java # src/main/java/fr/utc/onzzer/client/main/RegisterViewController.java # src/main/java/fr/utc/onzzer/client/main/impl/IHMMainServicesImpl.java # src/main/java/fr/utc/onzzer/client/music/AddTrackViewController.java # src/main/java/fr/utc/onzzer/client/music/DeleteTrackViewController.java # src/main/java/fr/utc/onzzer/client/music/DownloadViewController.java # src/main/java/fr/utc/onzzer/client/music/EditTrackViewController.java # src/main/java/fr/utc/onzzer/client/music/ListenViewController.java # src/main/java/fr/utc/onzzer/client/music/SearchViewController.java # src/main/java/fr/utc/onzzer/client/music/services/ViewMusicServices.java # src/main/java/fr/utc/onzzer/client/music/services/impl/ViewMusicServicesImpl.java # src/main/resources/fxml/login-view.fxml # src/main/resources/fxml/main-view.fxml # src/main/resources/fxml/register-view.fxml # src/test/java/client/MainClient.java # src/test/java/client/main/MainController.java