Merge origin/master

Conflicts:
	src/java/pt/uc/dei/ipj/grupoa/facades/PlaylistFacade.java
Merge origin/master
Merge origin/master

Conflicts:
	src/java/pt/uc/dei/ipj/grupoa/facades/PlaylistFacade.java
Merge origin/master
Merge origin/master

Conflicts:
	src/java/pt/uc/dei/ipj/grupoa/facades/PlaylistFacade.java
Merge origin/master

Conflicts:
	src/java/pt/uc/dei/ipj/grupoa/facades/PlaylistFacade.java
Merge origin/master

Conflicts:
	web/editthatmusic.xhtml