Teste
Merge branch 'master' of https://github.com/ViniciusAtaide/PWeb

Conflicts:
	WebContent/WEB-INF/tags/menu.tag
	WebContent/WEB-INF/tags/music.tag
	WebContent/WEB-INF/tags/style.tag
	WebContent/WEB-INF/tags/topmusic.tag
	WebContent/music.jsp
	src/application/Application1.java
	src/controller/MusicaController.java
	src/model/MiniPost.java
	src/model/Musica.java
	src/model/Usuario.java