Merge remote-tracking branch 'origin/master'

Conflicts:
	anbadoserver/templates/examples/playerWithTimeline.html
Merge branch 'master' of https://github.com/anbadovideo/anbado-video