Merge origin/master

Conflicts:
	src/projectogetplay/Playlist.java
Merge origin/master
Merge origin/master

Conflicts:
	src/projectogetplay/Playlist.java
Merge origin/master

Conflicts:
	src/projectogetplay/Playlist.java
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/projectogetplay/Playlist.java
Merge origin/master

Conflicts:
	src/projectogetplay/TableModelMusica.java
Merge origin/master

Conflicts:
	src/projectogetplay/TableModelMusica.java
testes
testes