js
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/ippo.js
Merge branch 'master' of https://github.com/scuolacomicsfi/ippo

Conflicts:
	www/js/ippo.js
Merge branch 'master' of https://github.com/scuolacomicsfi/ippo