Solved the conflits, for now
Merge branch 'master' of https://github.com/miglrodri/MusicFox_Web.git

Conflicts:
	WebContent/HomeView.jsp
	WebContent/css/simple-sidebar.css
	WebContent/js/jquery.js
	pom.xml
	src/com/musicfox/Album.java
	src/com/musicfox/Artist.java
	src/com/musicfox/JavaBean.java
	src/com/musicfox/MusicController.java
	src/com/musicfox/Track.java