1. variable from template html
Merge remote-tracking branch 'origin/master'

Conflicts:
	anbadoserver/static/Init.js
	anbadoserver/templates/examples/playerWithTimeline.html
	sample_db.py