Merge origin/master

Conflicts:
	src/java/facades/MusicFacade.java
Merge origin/master