Admin page 1.0
Player view accordion add
properties
Merge branch 'master' of https://github.com/franckRicart/WebPlayer.git

Conflicts:
	WebPlayer/WebContent/WEB-INF/dao.properties
	WebPlayer/WebContent/WEB-INF/userViews/player.jsp
	WebPlayer/WebContent/data/js/playerController.js
	WebPlayer/src/com/webplayer/dao/dao.properties