conflicting files
Merge branch 'master' of https://github.com/franckRicart/WebPlayer.git

Conflicts:
	WebPlayer/WebContent/WEB-INF/userViews/player.jsp