different network listeners that are threads
commit intermediare networklistener
conflict resolution
abstract network listener created with port differentiation
conflict resolution controller
Implémentation de MessageGetUser, autant que possible)
Correction API Profile
Correction nom variable
Merge origin/master into Category

Conflicts:
	BitMusic/bitmusic/profile/Category.java
Merge branch 'master' of https://github.com/LO23/BitMusic into editingClasses1

Conflicts:
	BitMusic/bitmusic/hmi/api/ApiHmi.java
	BitMusic/bitmusic/hmi/mainwindow/WindowComponent.java
	BitMusic/bitmusic/hmi/mainwindow/WindowController.java
	BitMusic/bitmusic/hmi/mainwindow/WindowModel.java
	BitMusic/bitmusic/hmi/mainwindow/WindowView.java
	BitMusic/bitmusic/hmi/modules/connection/ConnectionComponent.java
	BitMusic/bitmusic/hmi/modules/connection/ConnectionController.java
	BitMusic/bitmusic/hmi/patterns/AbstractComponent.java
	BitMusic/bitmusic/hmi/patterns/AbstractController.java
	BitMusic/bitmusic/hmi/patterns/AbstractModuleComponent.java
	BitMusic/bitmusic/hmi/patterns/AbstractView.java
	BitMusic/bitmusic/music/data/SongLibrary.java
	BitMusic/bitmusic/profile/Category.java
	BitMusic/bitmusic/profile/ProfileExceptions.java
	BitMusic/bitmusic/profile/Rights.java
	BitMusic/bitmusic/profile/User.java
network listener to complete
Ajout des fonctions dans l'Api (uniquement les fonctions qui sont utilisées par les autres modules qu'IHM)
Corrections OnlineUsersModel mineures
Merge origin/master into Category
network listener 2
Merge pull request #109 from hebergui/BRANCHE_creation-fonction-api

[IHM] Ajout des fonctions dans l'Api
Merge origin/master into Category

Conflicts:
	BitMusic/bitmusic/profile/Category.java
Merge branch 'master' of https://github.com/LO23/BitMusic into IHM_update
Merge pull request #111 from unkedeuxke/IHM_update

[IHM] update