Merge origin/master

Conflicts:
	src/java/entities/Music.java
	src/java/entities/Playlist.java
Merge origin/master