bla bla
bla bla
Merge origin/master

Conflicts:
	src/java/pt/uc/dei/aor/projeto4/grupog/managebeans/WebServiceController.java
	web/listAllMusics.xhtml