Merge origin/master

Conflicts:
	src/java/pt/uc/dei/ipj/grupoa/EJB/OrderPlaylist.java