Merge branch 'master' of https://github.com/ecolehetic/H3P2017-G2

Signed-off-by: fpumir <fpumir@terredeweb.fr>

Conflicts:
	playlist/js/partyPlayer.js
Merge branch 'master' of https://github.com/ecolehetic/H3P2017-G2

Signed-off-by: fpumir <fpumir@terredeweb.fr>

Conflicts:
	playlist/js/partyPlayer.js