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

Conflicts:
	BitMusic/bitmusic/hmi/mainwindow/WindowComponent.java
Merge pull request #100 from Holywa/revisions

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