Merge origin/master

Conflicts:
	src/java/ejbs/MusicFacade.java