tabela das playlists semi feita
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
adicao de imagens