Final
Merge remote-tracking branch 'origin/master'

Conflicts:
	musicplayer.sqlite
	nbproject/private/private.xml
	src/com/SE/myPlayer/MusicPlayerGUI.java