qrcodeUtil.js
merge

Conflicts:
	server/util/qrcodeUtil.js