Merge branch 'master' of https://github.com/LO23/BitMusic

Conflicts:
	BitMusic/bitmusic/network/api/ApiHmi.java
	BitMusic/bitmusic/network/main/ApiHmiImpl.java