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
Merge pull request #118 from Holywa/removingGitIgnore

Merge branch 'master' of https://github.com/LO23/BitMusic into editingCl...
Merge origin/master into MilioPeralta