Some updates
Merge branch 'master' of https://github.com/franckRicart/WebPlayer.git
Managed synchronization with sorting
Merge branch 'master' of https://github.com/franckRicart/WebPlayer.git

Conflicts:
	WebPlayer/WebContent/data/data.json