first version with a working jplayer
Merge branch 'master' into player

Conflicts:
	index.html
early non working player version
Merge branch 'player'