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

...ng

Conflicts:
	BitMusic/bitmusic/hmi/mainwindow/WindowComponent.java