Experiments
Merge branch 'master' into hosted_devel

Conflicts:
	webapp/index.html
first attempt to restore the hosted version
restored hosted app
updated version
Merge branch 'master' into hosted_devel

Conflicts:
	src/index.html
	src/js/app.js
renabled hosted app
reenable dell'hosted version
Merge branch 'hosted_devel'