first working version
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/sample-ffw-structure.js
	static/js/track.js