Merge origin/master

Conflicts:
	src/java/session/MusicFacade.java