Merge
Merge2
Merge branch 'master' of https://github.com/miglrodri/MusicFox_Web.git

Conflicts:
	src/com/musicfox/MusicController.java