GetJsonSounds create
PlayerController Servlet modify in Player
Upload Servlet modification
Merge branch 'master' of https://github.com/franckRicart/WebPlayer.git

Conflicts:
	WebPlayer/WebContent/WEB-INF/userViews/player.jsp
	WebPlayer/WebContent/data/js/playerController.js
	WebPlayer/src/com/webplayer/servlets/GetJSONData.java