Merge origin/master

Conflicts:
	web/Application/QR/qr.js
Merge origin/master