last changes
Merge branch 'master' of https://github.com/taloto07/MusicBox.git
Merge branch 'master' of https://github.com/taloto07/MusicBox.git

Conflicts:
	MusicBox/src/META-INF/persistence.xml
	MusicBox/src/test/DatabaseService.java
	MusicBox/src/test/test.java