some work
Merge branch 'master' of https://github.com/ppasq/torino3d

Conflicts:
	torino3d/templates/index.html
	torino3d/views.pyc