Tela Cantor finalizada.
Tela Musica 1 parte;
Tela Musica final;
Tela playlist - View
Tela playlist - ok
Tela Relatorio
Merge origin/master

Conflicts:
	src/main/java/br/com/dbs/java/mps/controller/CantorController.java
	src/main/java/br/com/dbs/java/mps/controller/MusicaController.java
	src/main/java/br/com/dbs/java/mps/controller/PlaylistController.java
	src/main/java/br/com/dbs/java/mps/model/Cantor.java
	src/main/java/br/com/dbs/java/mps/model/Musica.java
	src/main/java/br/com/dbs/java/mps/model/Playlist.java
	src/main/java/br/com/dbs/java/mps/model/dao/CantorDao.java
	src/main/java/br/com/dbs/java/mps/model/dao/hibernate/CantorDaoHibernate.java
	src/main/java/br/com/dbs/java/mps/model/dao/hibernate/MusicaDaoHibernate.java
	src/main/java/br/com/dbs/java/mps/view/CantorFrame.java
	src/main/java/br/com/dbs/java/mps/view/MusicPlaylistFrame.java
	src/main/java/br/com/dbs/java/mps/view/MusicaDialog.form
	src/main/java/br/com/dbs/java/mps/view/MusicaDialog.java
	src/main/java/br/com/dbs/java/mps/view/PlaylistDialog.form
	src/main/java/br/com/dbs/java/mps/view/PlaylistDialog.java
	src/main/java/br/com/dbs/java/mps/view/PlaylistFormDialog.form
	src/main/java/br/com/dbs/java/mps/view/PlaylistFormDialog.java
	src/main/java/br/com/dbs/java/mps/view/table/CantorTableModel.java
	src/main/java/br/com/dbs/java/mps/view/table/MusicaTableModel.java
	src/main/java/br/com/dbs/java/mps/view/table/PlaylistTableModel.java