Effect update
Some css
some update
Merge branch 'master' of https://github.com/franckRicart/WebPlayer.git

Conflicts:
	WebPlayer/WebContent/WEB-INF/Player.jsp
	WebPlayer/WebContent/data/data.json