khg
Merge branch 'master' of https://github.com/GrEx0/QuQu7js

Conflicts:
	js/view/AcquireQRView.js
g
Merge branch 'master' of https://github.com/GrEx0/QuQu7js

Conflicts:
	js/model/Collegamento.js